Skip to content

PR with changes from F2F for Language / Work and Education #2374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2019
Merged

PR with changes from F2F for Language / Work and Education #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac3df98
PR with changes from F2F for Language / Work and Education
codeMinter May 28, 2019
84544c6
fix yyy display for date fields
codeMinter May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 49 additions & 5 deletions src/shared/components/Settings/Profile/Education/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import React from 'react';
import PT from 'prop-types';
import _ from 'lodash';
import moment from 'moment';
import Select from 'components/Select';
import ConsentComponent from 'components/Settings/ConsentComponent';
import { PrimaryButton } from 'topcoder-react-ui-kit';
import DatePicker from 'components/challenge-listing/Filters/DatePicker';
import dropdowns from './dropdowns.json';
import EducationList from './List';

Expand All @@ -30,6 +32,7 @@ export default class Education extends ConsentComponent {
this.onAddEducation = this.onAddEducation.bind(this);
this.loadPersonalizationTrait = this.loadPersonalizationTrait.bind(this);
this.updatePredicate = this.updatePredicate.bind(this);
this.onUpdateDate = this.onUpdateDate.bind(this);

const { userTraits } = props;
this.state = {
Expand Down Expand Up @@ -138,7 +141,7 @@ export default class Education extends ConsentComponent {


if (errorMessage.length > 0) {
errorMessage = `${errorMessage}. ${dateError}`;
errorMessage = `${errorMessage}. \n${dateError}`;
} else if (dateError.length > 0) {
errorMessage = dateError;
invalid = dateInvalid;
Expand All @@ -152,6 +155,15 @@ export default class Education extends ConsentComponent {
this.showConsent(this.onDeleteEducation.bind(this, indexNo));
}

onUpdateDate(date, timePeriod) {
if (date) {
const { newEducation: oldEducation } = this.state;
const newEducation = { ...oldEducation };
newEducation[timePeriod] = date;
this.setState({ newEducation });
}
}

/**
* Delete education by index
* @param indexNo the education index no
Expand Down Expand Up @@ -398,7 +410,15 @@ export default class Education extends ConsentComponent {
</div>
<div styleName="field col-2">
<span styleName="text-required">* Required</span>
<input id="timePeriodFrom" styleName="date-input" name="timePeriodFrom" type="date" onChange={this.onUpdateInput} value={newEducation.timePeriodFrom} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newEducation.timePeriodFrom}
id="date-from1"
onDateChange={date => this.onUpdateDate(date, 'timePeriodFrom')}
placeholder="dd/mm/yyyy"
/>
</div>
</div>
<div styleName="row">
Expand All @@ -410,7 +430,15 @@ export default class Education extends ConsentComponent {
</div>
<div styleName="field col-2">
<span styleName="text-required">* Required</span>
<input id="timePeriodTo" styleName="date-input" name="timePeriodTo" type="date" onChange={this.onUpdateInput} value={newEducation.timePeriodTo} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newEducation.timePeriodTo}
id="date-to1"
onDateChange={date => this.onUpdateDate(date, 'timePeriodTo')}
placeholder="dd/mm/yyyy"
/>
</div>
</div>
<div styleName="row">
Expand Down Expand Up @@ -493,14 +521,30 @@ export default class Education extends ConsentComponent {
From
<input type="hidden" />
</label>
<input id="timePeriodFrom" styleName="date-input" name="timePeriodFrom" type="date" onChange={this.onUpdateInput} value={newEducation.timePeriodFrom} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newEducation.timePeriodFrom}
id="date-from2"
onDateChange={date => this.onUpdateDate(date, 'timePeriodFrom')}
placeholder="dd/mm/yyyy"
/>
</div>
<div styleName="field col-date">
<label htmlFor="timePeriodTo">
To
<input type="hidden" />
</label>
<input id="timePeriodTo" styleName="date-input" name="timePeriodTo" type="date" onChange={this.onUpdateInput} value={newEducation.timePeriodTo} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newEducation.timePeriodTo}
id="date-to2"
onDateChange={date => this.onUpdateDate(date, 'timePeriodTo')}
placeholder="dd/mm/yyyy"
/>
</div>
<div styleName="field col-checkbox">
<div styleName="tc-checkbox">
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/Settings/Profile/Education/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ $checkbox-bg-selected: $tc-dark-blue;
background-color: $tc-red-10;
color: $tc-red-110;
font-size: 15px;
padding: 15px;
line-height: 21px;
padding: 12px 15px;
margin-bottom: 15px;
white-space: pre-line;
}
}

Expand Down
55 changes: 50 additions & 5 deletions src/shared/components/Settings/Profile/Work/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import React from 'react';
import PT from 'prop-types';
import _ from 'lodash';
import moment from 'moment';
import ConsentComponent from 'components/Settings/ConsentComponent';
import { PrimaryButton } from 'topcoder-react-ui-kit';
import DatePicker from 'components/challenge-listing/Filters/DatePicker';
import WorkList from './List';

import './styles.scss';
Expand All @@ -27,6 +29,8 @@ export default class Work extends ConsentComponent {
this.onAddWork = this.onAddWork.bind(this);
this.loadPersonalizationTrait = this.loadPersonalizationTrait.bind(this);
this.updatePredicate = this.updatePredicate.bind(this);
this.onUpdateDate = this.onUpdateDate.bind(this);

const { userTraits } = props;
this.state = {
formInvalid: false,
Expand Down Expand Up @@ -153,7 +157,7 @@ export default class Work extends ConsentComponent {


if (errorMessage.length > 0) {
errorMessage = `${errorMessage}. ${dateError}`;
errorMessage = `${errorMessage}. \n${dateError}`;
} else if (dateError.length > 0) {
errorMessage = dateError;
invalid = dateInvalid;
Expand All @@ -167,6 +171,15 @@ export default class Work extends ConsentComponent {
this.showConsent(this.onDeleteWork.bind(this, indexNo));
}

onUpdateDate(date, timePeriod) {
if (date) {
const { newWork: oldWork } = this.state;
const newWork = { ...oldWork };
newWork[timePeriod] = date;
this.setState({ newWork });
}
}

/**
* Delete work by index
* @param indexNo the work index no
Expand Down Expand Up @@ -376,7 +389,15 @@ export default class Work extends ConsentComponent {
</div>
<div styleName="field col-2">
<span styleName="text-required">* Required</span>
<input id="timePeriodFrom" styleName="date-input" name="timePeriodFrom" type="date" onChange={this.onUpdateInput} value={newWork.timePeriodFrom} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newWork.timePeriodFrom}
id="date-from1"
onDateChange={date => this.onUpdateDate(date, 'timePeriodFrom')}
placeholder="dd/mm/yyyy"
/>
</div>
</div>
<div styleName="row">
Expand All @@ -388,7 +409,15 @@ export default class Work extends ConsentComponent {
</div>
<div styleName="field col-2">
<span styleName="text-required">* Required</span>
<input id="timePeriodTo" styleName="date-input" name="timePeriodTo" type="date" onChange={this.onUpdateInput} value={newWork.timePeriodTo} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newWork.timePeriodTo}
id="date-to1"
onDateChange={date => this.onUpdateDate(date, 'timePeriodTo')}
placeholder="dd/mm/yyyy"
/>
</div>
</div>
</form>
Expand Down Expand Up @@ -444,14 +473,30 @@ export default class Work extends ConsentComponent {
From
<input type="hidden" />
</label>
<input id="timePeriodFrom" styleName="date-input" name="timePeriodFrom" type="date" onChange={this.onUpdateInput} value={newWork.timePeriodFrom} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newWork.timePeriodFrom}
id="date-from2"
onDateChange={date => this.onUpdateDate(date, 'timePeriodFrom')}
placeholder="dd/mm/yyyy"
/>
</div>
<div styleName="field col-date">
<label htmlFor="timePeriodTo">
To
<input type="hidden" />
</label>
<input id="timePeriodTo" styleName="date-input" name="timePeriodTo" type="date" onChange={this.onUpdateInput} value={newWork.timePeriodTo} required />
<DatePicker
readOnly
numberOfMonths={1}
isOutsideRange={moment()}
date={newWork.timePeriodTo}
id="date-to2"
onDateChange={date => this.onUpdateDate(date, 'timePeriodTo')}
placeholder="dd/mm/yyyy"
/>
</div>
</div>
</form>
Expand Down
4 changes: 3 additions & 1 deletion src/shared/components/Settings/Profile/Work/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ $checkbox-bg-selected: $tc-dark-blue;
background-color: $tc-red-10;
color: $tc-red-110;
font-size: 15px;
padding: 15px;
margin-bottom: 15px;
line-height: 21px;
padding: 12px 15px;
white-space: pre-line;
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/shared/reducers/page/ui/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import settingsActions from 'actions/page/ui/settings';
const TABS = {
PROFILE: {
BASIC: 'basic info',
// LANGUAGE: 'language',
SKILL: 'skills',
// EDUCATION: 'education',
// WORK: 'work',
LANGUAGE: 'language',
EDUCATION: 'education',
WORK: 'work',
// ORGANIZATION: 'organization',
SKILL: 'skills',
HOBBY: 'hobbies',
COMMUNITY: 'communities',
},
Expand Down