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

Fixed column names and the report

Browse Source
This commit is contained in:
Senad Uka
2019-07-07 07:02:42 +02:00
parent 2fcb10522c
commit 1e1c61882f
16 changed files with 455 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import { Container } from 'semantic-ui-react';
import MainMenu from '../../components/MainMenu';
import DateRangePicker from '../../components/DateRangePicker';
import MemberIncidentsTable from '../../components/MemberIncidentsTable';
import MemberIncidentsTables from '../../components/MemberIncidentsTables';
import { fetchIncidents } from '../../store/actions';
@@ -24,7 +24,7 @@ class IncidentsReport extends Component {
<hr/>
<DateRangePicker buttonLabel="Show report" onDatesUpdate={this.onDatesUpdate.bind(this)} />
<br/>
<MemberIncidentsTable loading={pendingIncidents} incidents={incidents} openMemberSummaryOnMemberClick />
<MemberIncidentsTables pendingIncidents={pendingIncidents} incidents={incidents} />
</Container>
);
}

3
client/src/scenes/PracticeSummaryReport/components/MemberSelector.js
View File

@@ -22,7 +22,7 @@ class MemberSelector extends Component {
}
render(){
const { members } = this.props;
const { members, defaultMemberId } = this.props;
const dropdownOptions = members && Array.isArray(members) ? members.map(member => ({
key: member.memberId,
@@ -41,6 +41,7 @@ class MemberSelector extends Component {
search
fluid
onChange={this.onMemberSelectionChange.bind(this)}
value={defaultMemberId ? defaultMemberId : null}
/>
</Form>
);

13
client/src/scenes/PracticeSummaryReport/components/MemberSummary.js
View File

@@ -1,7 +1,11 @@
import React from 'react';
import { Loader, Grid } from 'semantic-ui-react';
import { UNSCHEDULED_INCIDENT, UNLOCKED_INCIDENT } from '../../../constants/enums';
import {
UNSCHEDULED_INCIDENT_BEFORE_RESERVATION,
UNLOCKED_INCIDENT_RELATED_WITH_RESERVATION,
UNSCHEDULED_INCIDENT_AFTER_RESERVATION, UNSCHEDULED_INCIDENT_STANDALONE, UNLOCKED_INCIDENT_STANDALONE
} from '../../../constants/enums';
const MemberSummary = props => {
const { loading } = props;
@@ -12,10 +16,13 @@ const MemberSummary = props => {
incidents.forEach((incident) => {
switch (incident.incidentType) {
case UNSCHEDULED_INCIDENT:
case UNSCHEDULED_INCIDENT_BEFORE_RESERVATION:
case UNSCHEDULED_INCIDENT_AFTER_RESERVATION:
case UNSCHEDULED_INCIDENT_STANDALONE:
totalUnscheduledFees += parseFloat(incident.totalChargeFee);
break;
case UNLOCKED_INCIDENT:
case UNLOCKED_INCIDENT_RELATED_WITH_RESERVATION:
case UNLOCKED_INCIDENT_STANDALONE:
totalUnlockedFees += parseFloat(incident.incidentPrice);
break;
default:

11
client/src/scenes/PracticeSummaryReport/index.js
View File

@@ -6,7 +6,7 @@ import MainMenu from '../../components/MainMenu';
import DateRangePicker from '../../components/DateRangePicker';
import MemberSelector from './components/MemberSelector';
import MemberSummary from './components/MemberSummary';
import MemberIncidentsTable from '../../components/MemberIncidentsTable';
import MemberIncidentsTables from '../../components/MemberIncidentsTables';
import { fetchMemberIncidents } from '../../store/actions';
@@ -40,6 +40,7 @@ class PracticeSummaryReport extends Component {
render () {
const { memberIncidents, loading } = this.props;
const { memberId } = this.state;
return (
<Container>
@@ -49,7 +50,7 @@ class PracticeSummaryReport extends Component {
<Grid stackable columns="equal">
<Grid.Row>
<Grid.Column>
<MemberSelector onMemberSelect={this.onMemberSelectionUpdate.bind(this)} />
<MemberSelector onMemberSelect={this.onMemberSelectionUpdate.bind(this)} defaultMemberId={memberId} />
</Grid.Column>
<Grid.Column>
<DateRangePicker inlineButton onDatesUpdate={this.onDateRangeUpdate.bind(this)}/>
@@ -66,11 +67,7 @@ class PracticeSummaryReport extends Component {
<Grid.Row/>
<Grid.Row>
<Grid.Column>
<MemberIncidentsTable
title="Detail list"
incidents={memberIncidents}
loading={loading}
/>
<MemberIncidentsTables incidents={memberIncidents} pendingIncidents={loading} hideMemberName/>
</Grid.Column>
</Grid.Row>
</Grid>