From ed62ed0df2f0089a046b37f18048a51fb442fb75 Mon Sep 17 00:00:00 2001
From: James D'Alton <jda1g15@soton.ac.uk>
Date: Tue, 12 May 2020 16:05:33 +0100
Subject: [PATCH] Edits to submissions table
---
compforge/src/Components/SubsScreen.react.jsx | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/compforge/src/Components/SubsScreen.react.jsx b/compforge/src/Components/SubsScreen.react.jsx
index 8ef88b30..0b8b8c49 100644
--- a/compforge/src/Components/SubsScreen.react.jsx
+++ b/compforge/src/Components/SubsScreen.react.jsx
@@ -61,18 +61,14 @@ const SubsScreen = (props) => {
let subRows = formsubs.map((el, i) => {
return (<TableRow key={i}>
- <TableCell component="th" scope="row">
- {el.formdata.title}
- </TableCell>
+ <TableCell component="th" scope="row">{el.formdata.title}</TableCell>
<TableCell align="left">{el.formdata.questions.length}</TableCell>
- <TableCell style={{ minWidth: 100 }} align="left">{moment.unix(el.submittedtime?.seconds).format("DD MMM YY")} </TableCell>
+ <TableCell style={{ minWidth: 100 }} align="left">{moment.unix(el.submittedtime?.seconds).format("DD/MM/YYYY")} </TableCell>
<TableCell align="left">{el.submittedbyname} at {el.submittedbyemail}</TableCell>
<TableCell align="left">{el.sourceowneremail}</TableCell>
- <TableCell align="right">
- <div style={{padding: 16, paddingRight: 0}}>
+ <TableCell align="right"><div style={{padding: 16, paddingRight: 0}}>
<VisibilityIcon onClick={() => {toggleModalState(el)}}
style={{ cursor: 'pointer', color: '#3498DB', fontSize: 16}} />
-
{/*/This is set to false to be disabled , you may enablde later if requires, make sure you import the correct action in dispatch*/}
{false && userId === el.createdbyid &&
@@ -90,10 +86,9 @@ const SubsScreen = (props) => {
<TableHead>
<TableRow>
<TableCell>Title</TableCell>
- <TableCell align="left">Number of Questions</TableCell>
- <TableCell align="left">Submitted time</TableCell>
- <TableCell align="left">Submitted by</TableCell>
- <TableCell align="left">Form created by</TableCell>
+ <TableCell align="left">Questions</TableCell>
+ <TableCell align="left">Submitted</TableCell>
+ <TableCell align="left">Submission from</TableCell>
<TableCell align="right">Actions</TableCell>
</TableRow>
</TableHead>
--
GitLab