Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#Staging #717

Merged
merged 8 commits into from
Sep 12, 2024
Merged

#Staging #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
89c2903
[ch37630] Incorrect reporting of priority observations in etools FAM …
danNordlogic Jul 25, 2024
7810423
Merge pull request #713 from unicef/remove-report-high-priority-findings
danNordlogic Jul 30, 2024
62d1e4b
[ch37656] DEV apps bugs
danNordlogic Jul 30, 2024
56a2dfd
[ch37719] fixed partner name order
pendea Aug 7, 2024
a465b42
Merge pull request #714 from unicef/37719
danNordlogic Aug 7, 2024
10b3048
[ch37719] fixed audit firm order
pendea Aug 7, 2024
8264fd4
Merge pull request #715 from unicef/37719
danNordlogic Aug 7, 2024
04dbd40
Merge pull request #716 from unicef/develop
danNordlogic Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../elements/pages/audits/report-page-components/findings-summary/findings-summary-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@ export class FindingsSummaryDialog extends CommonMethodsMixin(TableElementsMixin
${aeNumber} and Financial Findings: ${ffNumber} are in USD`;
}
let isvalid = true;
if (aeNumber < ffNumber) {
if (aeNumber <= ffNumber) {
ffElement.invalid = true;
ffElement.errorMessage = 'Cannot exceed Audited Expenditure';
ffElement.errorMessage = 'Must be less than Audited Expenditure';
isvalid = false;
} else {
ffElement.invalid = false;
Expand All @@ -383,9 +383,9 @@ export class FindingsSummaryDialog extends CommonMethodsMixin(TableElementsMixin
const ffNumberLocal = ffElementLocal && toNumber(ffElementLocal.value);
const aeElementLocal = this.shadowRoot!.querySelector('#audited-expenditure-local') as unknown as EtoolsCurrency;
const aeNumberLocal = aeElementLocal && toNumber(aeElementLocal.value);
if (aeNumberLocal < ffNumberLocal) {
if (aeNumberLocal <= ffNumberLocal) {
ffElementLocal.invalid = true;
ffElementLocal.errorMessage = 'Cannot exceed Audited Expenditure Local';
ffElementLocal.errorMessage = 'Must be less than Audited Expenditure Local';
isvalid = false;
} else {
ffElementLocal.invalid = false;
Expand Down
8 changes: 4 additions & 4 deletions src_ts/elements/pages/engagements/engagements-list-view/list-view-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ export class ListViewBase extends connect(store)(CommonMethodsMixin(LitElement))
label: 'Audit Firm',
name: 'agreement.auditor_firm.name',
type: EtoolsTableColumnType.Text,
sort: 'agreement__auditor_firm__name',
sort: 'agreement__auditor_firm__organization__name',
path: 'agreement.audit_firm'
},
{
label: 'Name',
name: 'partner.name',
type: EtoolsTableColumnType.Text,
sort: 'partner__name',
sort: 'partner__organization__name',
path: 'partner.name'
},
{
Expand Down Expand Up @@ -400,8 +400,8 @@ export class ListViewBase extends connect(store)(CommonMethodsMixin(LitElement))
sortChange(e: CustomEvent) {
const colKeyToSortKey = {
reference_number: 'reference_number',
'agreement.auditor_firm.name': 'agreement__auditor_firm__name',
'partner.name': 'partner__name',
'agreement.auditor_firm.name': 'agreement__auditor_firm__organization__name',
'partner.name': 'partner__organization__name',
engagement_type: 'engagement_type',
status: 'status'
};
Expand Down
10 changes: 0 additions & 10 deletions ...ments/pages/spot-checks/report-page-components/sc-report-page-main/sc-report-page-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ export class ScReportPageMain extends LitElement {
>
</overview-element>

<summary-findings-element
id="findingsHighPriority"
.dataItems="${this.getFindingsDataFiltered(this.engagement.findings, this.priorities.high.value)}"
.errorObject="${this.errorObject}"
.originalData="${this.getFindingsDataFiltered(this.originalData.findings, this.priorities.high.value)}"
.priority="${this.priorities.high}"
.optionsData="${this.optionsData}"
>
</summary-findings-element>

<summary-findings-element
id="findingsLowPriority"
.dataItems="${this.getFindingsDataFiltered(this.engagement.findings, this.priorities.low.value)}"
Expand Down