Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit d9942b9
Author: benne238 <benne238@purdue.edu>
Date:   Wed Jan 27 21:05:25 2021 -0500

    removal of debugging lines

commit 02ab227
Author: benne238 <benne238@purdue.edu>
Date:   Wed Jan 27 21:04:33 2021 -0500

    fix for accounting for empty content in messages

commit 610bc86
Author: benne238 <benne238@purdue.edu>
Date:   Tue Jan 12 15:23:52 2021 -0500

    removal of queueDirectory testing code

commit 30d9cfe
Author: benne238 <benne238@purdue.edu>
Date:   Mon Jan 11 14:30:01 2021 -0500

    implementation of blank content handling

commit 2bd362c
Author: Justin Campbell <campb303@purdue.edu>
Date:   Wed Dec 30 15:13:54 2020 -0500

    Update Python requirements to fix Flask_JWT_Extended and PyJWT conflict

commit 38445fe
Merge: 0fd6f0a c20b9b8
Author: Campbell, Justin <campb303@purdue.edu>
Date:   Tue Dec 15 21:55:33 2020 -0500

    Merge pull request #154 from ECN/enhancement-persistent-filters-and-sorting

    Enhancement persistent filters and sorting

commit c20b9b8
Author: Justin Campbell <campb303@purdue.edu>
Date:   Tue Dec 15 21:54:39 2020 -0500

    Minor formatting

commit 2cccad2
Author: Tyler Jordan Wright <wrigh393@w2vm1.ecn.purdue.edu>
Date:   Fri Dec 11 13:09:17 2020 -0500

    Set autoResetFilters to false in order to stop filters from resetting on data change.

commit d842e2c
Author: Tyler Jordan Wright <wrigh393@w2vm1.ecn.purdue.edu>
Date:   Wed Dec 9 11:08:19 2020 -0500

    disabled autoResetSortBy to allow for sorting to persist when data changes.

commit 0fd6f0a
Author: Justin Campbell <campb303@w2vm4.ecn.purdue.edu>
Date:   Thu Dec 3 20:13:58 2020 -0500

    Update UI Snapshot
  • Loading branch information
benne238 committed Jan 31, 2021
1 parent 1e819d8 commit 7535510
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# webqueue2
A re-write of Purdue ECN's webqueue

![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-09-22%20at%201.48.58%20PM.png)
![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-12-03%20at%208.10.32%20PM.png)

## Stay Up To Date
See what's being worked on with [the webqueue2 Project](https://github.itap.purdue.edu/ECN/webqueue2/projects/).
Expand Down
8 changes: 7 additions & 1 deletion api/ECNQueue.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@ def __parseSections(self) -> list:
for assignment in assignementLsit:
sections.append(assignment)

# Checks for empty content within an item and returns and
if contentEnd <= contentStart:
blankInitialMessage = self.__initialMessageParsing([""])
sections.append(blankInitialMessage)
return sections

# Checks for Directory Identifiers
if self.__rawItem[contentStart] == "\n" and self.__rawItem[contentStart + 1].startswith("\t"):

Expand Down Expand Up @@ -1349,4 +1355,4 @@ def loadQueues() -> list:
for queue in getValidQueues():
queues.append(Queue(queue))

return queues
return queues
36 changes: 14 additions & 22 deletions api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
aniso8601==8.0.0
astroid==2.4.2
click==7.1.2
Flask==1.1.2
Flask-RESTful==0.3.8
Flask-JWT-Extended==3.24.1
gunicorn==20.0.4
isort==4.3.21
itsdangerous==1.1.0
Jinja2==2.11.2
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
pylint==2.5.3
python-dateutil==2.8.1
python-dotenv==0.15.0
pytz==2020.1
six==1.15.0
toml==0.10.1
typed-ast==1.4.1
Werkzeug==1.0.1
wrapt==1.12.1
# See: https://pip.pypa.io/en/stable/reference/pip_install/#example-requirements-file

# General Utilities
gunicorn
pipdeptree
pylint

# API
python-dotenv
Flask-RESTful
python-dateutil
Flask-JWT-Extended
# Prevent upgrade to 2.x until Flask-JWT-Extended is updated to support it
PyJWT == 1.*
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions src/components/ItemTable/ItemTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ArrowDownward, ArrowUpward } from "@material-ui/icons";
export default function ItemTable({ data, rowCanBeSelected }) {
const [selectedRow, setSelectedRow] = useState({ queue: null, number: null});

const theme = useTheme();
const theme = useTheme();
const useStyles = makeStyles({
// Fully visible for active icons
activeSortIcon: {
Expand Down Expand Up @@ -57,6 +57,8 @@ export default function ItemTable({ data, rowCanBeSelected }) {
{
columns,
data,
autoResetSortBy: false,
autoResetFilters: false,
defaultColumn: {
Filter: ({ column: { Header, setFilter } }) => {
return (
Expand All @@ -68,7 +70,7 @@ export default function ItemTable({ data, rowCanBeSelected }) {
}
},
},
useFilters, useFlexLayout, useSortBy,
useFilters, useFlexLayout, useSortBy,
);
const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow, } = tableInstance;

Expand Down Expand Up @@ -136,7 +138,7 @@ export default function ItemTable({ data, rowCanBeSelected }) {
classes={{ root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows }}
{...row.getRowProps()} >
{row.cells.map(cell => (
<TableCell
<TableCell
classes={{ root: classes.columnBorders }}
{...cell.getCellProps()}
>
Expand Down

0 comments on commit 7535510

Please sign in to comment.