Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #813 from derrabauke/fix-reject-report-icon
Browse files Browse the repository at this point in the history
fix(reject-report): display rejected reports to responsible
  • Loading branch information
derrabauke authored Feb 15, 2023
2 parents 74f1e34 + 75631c5 commit 428d7e0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
8 changes: 4 additions & 4 deletions app/components/report-review-warning/template.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="flex">
<div class="flex height-100">
{{#if this.unverifiedReports.hasReports}}
<li class="nav-top-list-item" title="You have reports to verify">
<LinkTo
Expand Down Expand Up @@ -31,21 +31,21 @@
@query={{hash
fromDate=null
toDate=this.unverifiedReports.reportsToDate
reviewer=this.session.data.user.id
user=this.session.data.user.id
editable=1
rejected=1
verified=0
customer=null
project=null
task=null
user=null
reviewer=null
billingType=null
costCenter=null
review=""
notBillable=""
}}
>
<FaIcon @icon="times-circle" />
<FaIcon @icon="circle-xmark" />
{{this.rejectedReports.amountReports}}
</LinkTo>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/services/rejected-reports.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default class RejectedReportsService extends Service {
try {
const reports = await this.store.query("report", {
to_date: this.reportsToDate.format("YYYY-MM-DD"),
reviewer: this.session.data.user.id,
user: this.session.data.user.id,
editable: 1,
rejected: 1,
page: { number: 1, size: 1 },
Expand Down
4 changes: 4 additions & 0 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ strong {
display: flex;
}

.height-100 {
height: 100%;
}

.pointer {
cursor: pointer;
}
Expand Down
1 change: 1 addition & 0 deletions config/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = function () {
"hand",
"square",
"square-check",
"circle-xmark",
"trash-can",
"user",
],
Expand Down

0 comments on commit 428d7e0

Please sign in to comment.