From 16006e933eccfe03381b0142495a8540d3d3c571 Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Sun, 29 Apr 2018 12:12:03 -0700 Subject: [PATCH] Delete team start times, fix download link style, fix download file name --- server/src/api/routes/ActivityRoutes.js | 4 +++- server/src/api/routes/TeamRoutes.js | 1 + server/src/api/routes/WorkItemRoutes.js | 1 + website/src/System/System.js | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/src/api/routes/ActivityRoutes.js b/server/src/api/routes/ActivityRoutes.js index db4ea94..f0a852e 100644 --- a/server/src/api/routes/ActivityRoutes.js +++ b/server/src/api/routes/ActivityRoutes.js @@ -1,7 +1,7 @@ import passport from "passport" import createError from "http-errors" import autobind from "autobind-decorator" -import { catchAll } from "." +import { catchAll, TeamRoutes } from "." @autobind export class ActivityRoutes { @@ -166,8 +166,10 @@ export class ActivityRoutes { async deleteAllActivities(req, res, next) { const Activity = this.db.Activity + const Team = this.db.Team await Activity.remove({}) + await Team.updateMany({}, { $set: { start: null } }) res.json({}) } diff --git a/server/src/api/routes/TeamRoutes.js b/server/src/api/routes/TeamRoutes.js index 9aea890..e0c558f 100644 --- a/server/src/api/routes/TeamRoutes.js +++ b/server/src/api/routes/TeamRoutes.js @@ -179,6 +179,7 @@ export class TeamRoutes { res.writeHead(200, { "Content-Type": "application/gzip", + "Content-Disposition": 'attachment; filename="team-scores.gzip"', }) readable.pipe(gzip).pipe(res) } diff --git a/server/src/api/routes/WorkItemRoutes.js b/server/src/api/routes/WorkItemRoutes.js index c5c1c57..7eca99e 100644 --- a/server/src/api/routes/WorkItemRoutes.js +++ b/server/src/api/routes/WorkItemRoutes.js @@ -204,6 +204,7 @@ export class WorkItemRoutes { const WorkItem = this.db.WorkItem await Activity.remove({}) + await Team.updateMany({}, { $set: { start: null } }) await WorkItem.remove({}) res.json({}) diff --git a/website/src/System/System.js b/website/src/System/System.js index 145e1b4..851cb11 100644 --- a/website/src/System/System.js +++ b/website/src/System/System.js @@ -1,6 +1,6 @@ import React, { Component, Fragment } from "react" import PropTypes from "prop-types" -import { Box, Image, Column, Row, Button, Link, Text } from "ui" +import { Box, Image, Column, Row, Button, Link } from "ui" import { MessageModal, WaitModal, YesNoMessageModal } from "../Modal" import { sizeInfo, colorInfo } from "ui/style" import headerLogo from "images/deighton.png" @@ -187,7 +187,7 @@ export class System extends Component { - Download Team Data + Download Team Data