Add global decorations filter; Add noSquad user filter
parent
67d6260c32
commit
a3df38263e
|
@ -31,7 +31,7 @@ decoration.route('/')
|
|||
if (req.query.q) {
|
||||
filter.name = {$regex: req.query.q, $options: 'i'}
|
||||
}
|
||||
DecorationModel.find(filter, {}, {sort: {fraction: 'asc', sortingNumber: 'asc', name: 'asc'}}, (err, items) => {
|
||||
DecorationModel.find(filter, {}, {sort: {fraction: 'asc', isMedal: 'asc', sortingNumber: 'asc', name: 'asc'}}, (err, items) => {
|
||||
if (err) {
|
||||
err.status = codes.servererror;
|
||||
return next(err);
|
||||
|
|
|
@ -56,7 +56,9 @@ users.route('/')
|
|||
if (!nameQuery || (nameQuery && user.username.toLowerCase().includes(nameQuery.toLowerCase()))) {
|
||||
getExtendedUser(user, next, (extUser) => {
|
||||
// filter by fraction
|
||||
if (!fractionFilter || (fractionFilter && extUser.squad && extUser.squad.fraction.toLowerCase() === fractionFilter)) {
|
||||
if (!fractionFilter ||
|
||||
(fractionFilter && extUser.squad && extUser.squad.fraction.toLowerCase() === fractionFilter) ||
|
||||
(fractionFilter && fractionFilter === 'unassigned' && !extUser.squad)) {
|
||||
resUsers.push(extUser);
|
||||
} else {
|
||||
rowsLength -= 1;
|
||||
|
@ -174,7 +176,7 @@ users.route('/:id')
|
|||
})
|
||||
})
|
||||
|
||||
.put(apiAuthenticationMiddleware, (req, res,next) => {
|
||||
.put(apiAuthenticationMiddleware, (req, res, next) => {
|
||||
// first check that the given element id is the same as the URL id
|
||||
if (!req.body || req.body._id !== req.params.id) {
|
||||
// the URL does not fit the given element
|
||||
|
|
|
@ -20,6 +20,14 @@
|
|||
#fractRadioOpfor
|
||||
(change)="filterSquadsByFraction(query.value, fractRadioOpfor.value)">CSAT
|
||||
</label>
|
||||
<br>
|
||||
<label class="radio-inline" style="padding-top: 8px;">
|
||||
<input type="radio" name="fractSelect" value="global"
|
||||
[(ngModel)]="fractionRadioSelect"
|
||||
#fractRadioGlobal
|
||||
(change)="filterSquadsByFraction(query.value, fractRadioGlobal.value)">Global
|
||||
</label>
|
||||
|
||||
</form>
|
||||
<a class="pull-right btn btn-success" (click)="openNewSquadForm()">
|
||||
Neue Auszeichnung hinzufügen
|
||||
|
|
|
@ -25,8 +25,7 @@
|
|||
overflow-x: hidden;
|
||||
width: 100%;
|
||||
border-left: thin solid lightgrey;
|
||||
padding-left: 50px;
|
||||
padding-top: 20px;
|
||||
padding: 20px 0 0 50px;
|
||||
margin-left: 10px;
|
||||
height: 100vh;
|
||||
bottom: 10px;
|
||||
|
@ -37,9 +36,7 @@
|
|||
}
|
||||
|
||||
h3 {
|
||||
margin-top: 80px;
|
||||
margin-bottom: 20px;
|
||||
margin-left: -20px;
|
||||
margin: 80px 0 20px -20px;
|
||||
}
|
||||
|
||||
label {
|
||||
|
|
|
@ -20,6 +20,13 @@
|
|||
#fractRadioOpfor
|
||||
(change)="filterUsersByFraction(query.value, fractRadioOpfor.value)">CSAT
|
||||
</label>
|
||||
<br>
|
||||
<label class="radio-inline" style="padding-top: 8px;">
|
||||
<input type="radio" name="fractSelect" value="unassigned"
|
||||
[(ngModel)]="fractionRadioSelect"
|
||||
#fractRadioUnassigned
|
||||
(change)="filterUsersByFraction(query.value, fractRadioUnassigned.value)">Ohne Squad
|
||||
</label>
|
||||
</form>
|
||||
<a class="pull-right btn btn-success" (click)="openNewUserForm()">
|
||||
Neuen Teilnehmer hinzufügen
|
||||
|
|
Loading…
Reference in New Issue