Compare commits

..

2 Commits

4 changed files with 5 additions and 4 deletions

View File

@ -15,8 +15,9 @@ Awarding associating a decoration to a user
# AwardingPopulated (Awarding) # AwardingPopulated (Awarding)
Awarding with populated decoration and proposer Awarding with populated decoration, proposer and army-user
## Properties ## Properties
+ proposer (Proposer, required) - app user who requested this awarding + proposer (Proposer, required) - app user who requested this awarding
+ decorationId (Decoration, required) - populated decoration object that is given with the awarding + decorationId (Decoration, required) - populated decoration object that is given with the awarding
+ userId (User, required) - populated user who gets this awarding

View File

@ -33,7 +33,7 @@ awarding.route('/')
filter.confirmed = 0; filter.confirmed = 0;
} }
AwardingModel.find(filter, {}, {sort: {date: 'desc'}}) AwardingModel.find(filter, {}, {sort: {date: 'desc'}})
.populate('decorationId').populate('proposer', resultSet) .populate('decorationId').populate('proposer', resultSet).populate('userId')
.exec((err, items) => { .exec((err, items) => {
if (err) { if (err) {
err.status = codes.servererror; err.status = codes.servererror;

View File

@ -33,7 +33,7 @@
} }
tbody { tbody {
background: #ffffffe0; background: rgba(255, 255, 255, 0.88);
} }
.cell-outline { .cell-outline {

View File

@ -27,7 +27,7 @@
.middle-row { .middle-row {
min-height: 120px; min-height: 120px;
border: rgb(34, 34, 34); border: rgb(34, 34, 34);
background-color: #ffffffe0; background-color: rgba(255, 255, 255, 0.88);
border-left-style: solid; border-left-style: solid;
border-right-style: solid; border-right-style: solid;
} }