diff --git a/api/routes/awardings.js b/api/routes/awardings.js index 4364c47..8ce0fc7 100644 --- a/api/routes/awardings.js +++ b/api/routes/awardings.js @@ -90,7 +90,8 @@ awarding.route('/unprocessed/:squadId') return next(); } const squadUserIds = users.map(user => mongoose.Types.ObjectId(user._id)); - AwardingModel.find({userId: {$in: squadUserIds}, confirmed: 0}, (err, awards) => { + AwardingModel.find({userId: {$in: squadUserIds}, confirmed: 0}).populate('decorationId').populate('proposer', resultSet).populate('userId') + .exec((err, awards) => { res.locals.items = awards; next(); }); diff --git a/static/src/app/app.config.ts b/static/src/app/app.config.ts index 92c7240..caf5810 100644 --- a/static/src/app/app.config.ts +++ b/static/src/app/app.config.ts @@ -5,6 +5,7 @@ export class AppConfig { public readonly apiAppUserPath = this.apiUrl + '/account/'; public readonly apiAuthenticationPath = this.apiUrl + '/authenticate'; public readonly apiAwardPath = this.apiUrl + '/awardings'; + public readonly apiAwardSquadPath = this.apiUrl + '/awardings/unprocessed'; public readonly apiCampaignPath = this.apiUrl + '/campaigns'; public readonly apiDecorationPath = this.apiUrl + '/decorations/'; public readonly apiLogsPath = this.apiUrl + '/logs'; diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.css b/static/src/app/request/sql-dashboard/sql-dashboard.component.css index e799ab8..45d7a13 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.css +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.css @@ -6,10 +6,6 @@ padding: 5px; } -.trash { - cursor: pointer; -} - .table { overflow-wrap: break-word; table-layout: fixed; @@ -23,11 +19,6 @@ padding: 5px; } -.form-group { - width: 25%; - min-width: 300px; -} - h3 { margin: 80px 0 20px -20px; } diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.html b/static/src/app/request/sql-dashboard/sql-dashboard.component.html index 93b3ed5..efe1c07 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.html +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.html @@ -1,4 +1,4 @@ -