senaduka/old-crm-integration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multiple bug fixes / Select summary report for month instead of whole date

Browse Source
This commit is contained in:
Senad Uka
2019-08-27 05:53:59 +02:00
parent 1447d800bf
commit 2403b57060
8 changed files with 166 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/scenes/IncidentsReport/index.js
View File

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { Container } from 'semantic-ui-react';
import MainMenu from '../../components/MainMenu';
import DateRangePicker from '../../components/DateRangePicker';
import MonthSelector from '../../components/MonthSelector';
import MemberIncidentsTables from '../../components/MemberIncidentsTables';
import GenerateFeesInORDButton from '../../components/GenerateFeesInORDButton';
@@ -38,7 +38,7 @@ class IncidentsReport extends Component {
<MainMenu/>
<h3>Incidents Report</h3>
<hr/>
<DateRangePicker buttonLabel="Show report" onDatesUpdate={this.onDatesUpdate} inlineButton />
<MonthSelector buttonLabel="Show report" onDatesUpdate={this.onDatesUpdate} inlineButton />
<br/>
<GenerateFeesInORDButton
memberIds={memberIds}

2
client/src/scenes/SpecificMemberIncidentsReport/components/MemberSelector.js
View File

@@ -33,7 +33,7 @@ class MemberSelector extends Component {
return (
<Form>
<label>{'\u00A0'}</label>
<label>{'Member name'}</label>
<Dropdown
options={dropdownOptions}
placeholder="Select Member"

4
client/src/scenes/SpecificMemberIncidentsReport/index.js
View File

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { Container, Grid } from 'semantic-ui-react';
import MainMenu from '../../components/MainMenu';
import DateRangePicker from '../../components/DateRangePicker';
import MonthSelector from '../../components/MonthSelector';
import MemberSelector from './components/MemberSelector';
import MemberSummary from './components/MemberSummary';
import MemberIncidentsTables from '../../components/MemberIncidentsTables';
@@ -58,7 +58,7 @@ class SpecificMemberIncidentsReport extends Component {
<MemberSelector onMemberSelect={this.onMemberSelectionUpdate.bind(this)} defaultMemberId={memberId} />
</Grid.Column>
<Grid.Column>
<DateRangePicker inlineButton onDatesUpdate={this.onDateRangeUpdate.bind(this)}/>
<MonthSelector inlineButton onDatesUpdate={this.onDateRangeUpdate.bind(this)}/>
</Grid.Column>
</Grid.Row>
<Grid.Row>