Commit 66389d54 authored by TJHeeringa's avatar TJHeeringa

Updated member current positioning

parent 11671c76
.MemberGrid{
width: 85%;
margin: 20px auto;
padding: 30px;
min-height: 800px;
}
.memberTableContainer{
......
......@@ -160,74 +160,72 @@ export class MemberGrid extends Component {
];
return (
<div className="pt-3">
<div className="box MemberGrid">
<Grid
rows={rows}
columns={headers}
<div className="MemberGrid">
<Grid
rows={rows}
columns={headers}
>
<SortingState
defaultSorting={[{ columnName: 'student_number', direction: 'asc' }]}
/>
<EditingState
onCommitChanges={this.onCommitChanges}
columnExtensions={this.props.editingStateColumnExtensions}
/>
<PagingState
defaultCurrentPage={0}
pageSize={10}
/>
<SelectionState
selection={selection}
onSelectionChange={this.onChangeSelection}
/>
<FilteringState
defaultFilters={defaultFilters}
/>
<SearchState defaultValue='' />
<IntegratedSorting />
<IntegratedFiltering />
<IntegratedSelection />
<IntegratedPaging />
<Table />
<TableEditRow />
<TableEditColumn
showEditCommand
// showDeleteCommand
// messages={{deleteCommand:'Archive'}}
/>
<TableHeaderRow
showSortingControls
/>
<TableColumnVisibility
columnExtensions={tableColumnVisibilityColumnExtensions}
onHiddenColumnNamesChange={this.onChangeHiddenColumns}
/>
<TableSelection
showSelectAll
selectByRowClick
/>
<TableFilterRow
showFilterSelector
/>
<PagingPanel />
<Toolbar />
<ColumnChooser />
<SearchPanel />
</Grid>
{ show_csv &&
<div className='align-btn-right'>
<CSVLink
data={this.generateCSVData()}
filename={'member_download.csv'}
>
<SortingState
defaultSorting={[{ columnName: 'student_number', direction: 'asc' }]}
/>
<EditingState
onCommitChanges={this.onCommitChanges}
columnExtensions={this.props.editingStateColumnExtensions}
/>
<PagingState
defaultCurrentPage={0}
pageSize={10}
/>
<SelectionState
selection={selection}
onSelectionChange={this.onChangeSelection}
/>
<FilteringState
defaultFilters={defaultFilters}
/>
<SearchState defaultValue='' />
<IntegratedSorting />
<IntegratedFiltering />
<IntegratedSelection />
<IntegratedPaging />
<Table />
<TableEditRow />
<TableEditColumn
showEditCommand
// showDeleteCommand
// messages={{deleteCommand:'Archive'}}
/>
<TableHeaderRow
showSortingControls
/>
<TableColumnVisibility
columnExtensions={tableColumnVisibilityColumnExtensions}
onHiddenColumnNamesChange={this.onChangeHiddenColumns}
/>
<TableSelection
showSelectAll
selectByRowClick
/>
<TableFilterRow
showFilterSelector
/>
<PagingPanel />
<Toolbar />
<ColumnChooser />
<SearchPanel />
</Grid>
{ show_csv &&
<div className='align-btn-right'>
<CSVLink
data={this.generateCSVData()}
filename={'member_download.csv'}
>
<Button color="primary" outline className="button-mt-20">
Download selection as CSV
</Button>
</CSVLink>
</div>
}
<Button color="primary" outline className="button-mt-20">
Download selection as CSV
</Button>
</CSVLink>
</div>
}
</div>
);
}
......
import React, {Component} from 'react'
import {withRouter} from 'react-router-dom'
import {MemberGrid} from 'App/Components/Member/MemberGrid'
import {BackButton} from "App/Components/BackButton";
import {Spinner} from "reactstrap";
import {Get} from "restful-react";
import {Helper} from "App/Helper";
import React, { Component } from 'react'
import { MemberGrid } from 'App/Components/Member/MemberGrid'
import { Helper } from "App/Helper";
import { withStyles } from "@material-ui/core";
const MembersCurrentStyles = theme => ({
container: {
backgroundColor: '#FFF',
padding: '25px',
borderRadius: '8px',
},
});
class MembersCurrent extends Component {
constructor(props) {
super(props);
......@@ -141,24 +146,20 @@ class MembersCurrent extends Component {
render() {
const {association} = this.props;
const { classes } = this.props;
return (
<x-fragment>
<div className={classes.container}>
{this.state.member_types !== undefined && this.state.members_current !== undefined &&
<div className="AllMembers">
<BackButton history={this.props.history} container={true}/>
<MemberGrid
editingStateColumnExtensions={this.morphDataToEditingStateColumnExtensions()}
memberProfiles={this.morphDataToMemberGridProfiles()}
show_csv={true}
headers={this.morphDataToHeaders()}
/>
</div>
}
</x-fragment>
</div>
)
}
}
export const MembersCurrentWithRouter = withRouter(MembersCurrent);
export const MembersCurrentWithRouter = withStyles(MembersCurrentStyles)(MembersCurrent);
......@@ -5,7 +5,6 @@ import {AvForm} from "availity-reactstrap-validation";
import {BackButton} from "App/Components/BackButton";
import {Helper} from "App/Helper";
import {AlertHandlerContext} from "../../Components/AlertHandler";
import {Authorized} from "../../Main/Authorized/Authorized";
export class MembershipEnd extends Component {
......
......@@ -77,11 +77,6 @@ img {
margin-right: -25px;
}
.MemberGrid {
margin: 20px auto;
padding: 30px;
}
.memberTableContainer {
overflow-x: auto;
}
......@@ -197,19 +192,6 @@ img {
overflow-x: auto;
}
.MemberGrid {
margin: 20px auto;
padding: 30px;
}
.memberTableContainer {
overflow-x: auto;
}
.memberTable {
width: 2000px;
}
.tablebutton {
margin-top: 20px;
}
......@@ -327,10 +309,6 @@ img {
margin-top: 66px !important;
}
.MemberGrid {
min-height: 800px;
}
.allMembersBtnLink:hover {
text-decoration: none !important;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment