diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js index 3ac4e8a0a4b0d20c0b1b1c7716e0e296d54188d9..1786abf63a203a8d1c253a65fcdb66602e41c46a 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js @@ -22,7 +22,7 @@ function GlobalFilter({ const [value, setValue] = React.useState(globalFilter) const onChange = useAsyncDebounce(value => {setGlobalFilter(value || undefined)}, 200) return ( - <span> + <span style={{marginLeft:"-10px"}}> <input value={value || ""} onChange={e => { @@ -139,7 +139,7 @@ function CalendarColumnFilter({ const [value, setValue] = useState(''); return ( <> - <Calendar value={value} onChange={(e) => { + <Calendar value={value} onChange={(e) => { const value = moment(e.value, moment.ISO_8601).format("YYYY-MMM-DD") setValue(value); setFilter(value); }} showIcon></Calendar> @@ -269,7 +269,6 @@ function Table({ columns, data, defaultheader, optionalheader }) { preGlobalFilteredRows, setGlobalFilter, setHiddenColumns, - } = useTable( { columns, @@ -294,8 +293,10 @@ function Table({ columns, data, defaultheader, optionalheader }) { return ( <> <div id="block_container" style={{ display: 'flex', verticalAlign: 'middle', marginTop:'20px'}}> - <div style={{textAlign:'left', marginRight:'30px'}}> + <div style={{textAlign:'left', marginRight:'30px'}}> <i className="fa fa-columns col-filter-btn" label="Toggle Columns" onClick={(e) => op.current.toggle(e)} /> + <div style={{position:"relative",top: "-25px",marginLeft: "50px",color: "#005b9f"}} onClick={() => setAllFilters([])} > + <i class="fas fa-sync-alt" title="Clear All Filters"></i></div> <OverlayPanel ref={op} id="overlay_panel" showCloseIcon={false} > <div> <div style={{textAlign: 'center'}}> @@ -333,8 +334,7 @@ function Table({ columns, data, defaultheader, optionalheader }) { </div> <div style={{overflow: 'auto', padding: '0.75em',}} className="tmss-table"> - <div style={{position:"relative",top: "-40px",marginLeft: "30px",color: "#005b9f"}} onClick={() => setAllFilters([])} ><i class="fas fa-sync-alt" title="Clear All Filters"></i></div> - <table {...getTableProps()} style={{width:'100%'}} data-testid="viewtable" className="viewtable" > + <table {...getTableProps()} style={{width:'100%'}} data-testid="viewtable" className="viewtable" > <thead> {headerGroups.map(headerGroup => ( <tr {...headerGroup.getHeaderGroupProps()}> @@ -356,12 +356,11 @@ function Table({ columns, data, defaultheader, optionalheader }) { </thead> <tbody {...getTableBodyProps()}> - {firstPageRows.map((row, i) => { - + {firstPageRows.map((row, i) => { prepareRow(row) return ( <tr {...row.getRowProps()}> - {row.cells.map(cell => { + {row.cells.map(cell => { if(cell.column.id !== 'actionpath') return <td {...cell.getCellProps()} >{cell.render('Cell')}</td> })} diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js index 556e322770ed92b06d1751a820eb8bf7b201e9e9..36d00db65f859d4922ec12eef0994c30f808a141 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js @@ -14,22 +14,9 @@ export class ProjectList extends Component{ }], defaultcolumns: [ { "name":"Name / Project Code", - "name":{ - name:"Name / Project Code", - filter: 'slider' - }, "status":"Status" , - "status" :{ - name:"Status", - filter:'switch' - }, "project_category_value":"Category of Project", "description":"Description", - "description":{ - name:"Description", - filter:'date' - } - }], optionalcolumns: [{ "priority_rank":"Project Priority",