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

DQ: Get Contact Emails for Follow-Up issue #27

Merged
merged 9 commits into from
Mar 18, 2024
Merged

DQ: Get Contact Emails for Follow-Up issue #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aec2304
adding filters
eperedo Mar 15, 2024
4ca7429
add filters to outlier step
eperedo Mar 15, 2024
3905742
mark step as completed
eperedo Mar 15, 2024
54970ab
remove hardcode key for step 3
eperedo Mar 15, 2024
84463ac
update step 4 and 7
eperedo Mar 15, 2024
6c60488
remove code
eperedo Mar 15, 2024
818d811
remove quality analysis in datastore
eperedo Mar 15, 2024
245cbc7
update locales
eperedo Mar 15, 2024
a32e156
get contact emails for follow up issue
eperedo Mar 16, 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
94 changes: 39 additions & 55 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-03-14T01:55:56.426Z\n"
"PO-Revision-Date: 2024-03-14T01:55:56.426Z\n"
"POT-Creation-Date: 2024-03-16T16:23:42.597Z\n"
"PO-Revision-Date: 2024-03-16T16:23:42.597Z\n"

msgid "Cannot be blank: {{fieldName}}"
msgstr ""
Expand Down Expand Up @@ -59,6 +59,11 @@ msgstr ""
msgid "Save Config Analysis"
msgstr ""

msgid ""
"No user with Capture rights and Organisation Unit associated to the issue "
"was found"
msgstr ""

msgid "Updating Issue..."
msgstr ""

Expand All @@ -74,6 +79,30 @@ msgstr ""
msgid "Double click to edit"
msgstr ""

msgid "Yes"
msgstr ""

msgid "No"
msgstr ""

msgid "{{countryNames}} and {{moreCountriesCount}} more"
msgstr ""

msgid "Close"
msgstr ""

msgid "Countries"
msgstr ""

msgid "Periods"
msgstr ""

msgid "Action"
msgstr ""

msgid "Follow Up"
msgstr ""

msgid "Issue"
msgstr ""

Expand All @@ -95,12 +124,6 @@ msgstr ""
msgid "Azure URL"
msgstr ""

msgid "Follow Up"
msgstr ""

msgid "Action"
msgstr ""

msgid "Contact Emails"
msgstr ""

Expand Down Expand Up @@ -146,7 +169,7 @@ msgstr ""
msgid "Data Quality Analysis"
msgstr ""

msgid "Outliers detection analysis based on DHIS2 min-max standard functionality"
msgid "Configuration"
msgstr ""

msgid "Algorithm"
Expand All @@ -155,42 +178,30 @@ msgstr ""
msgid "Threshold"
msgstr ""

msgid "Run"
msgstr ""

msgid "Run to get results"
msgstr ""

msgid "No Issues found"
msgstr ""

msgid "Running analysis..."
msgstr ""

msgid "Missing disaggregates in selected catcombos"
msgstr ""

msgid "CatCombos"
msgstr ""

msgid "Medical doctors analysis: General Practicioners missing and double counts"
msgstr ""

msgid "Disaggregations"
msgstr ""

msgid "Double Counts Threshold"
msgstr ""

msgid "Missing nursing personnel when midwifery personnel is present"
msgstr ""

msgid "Loading"
msgstr ""

msgid "Validation Rule Group"
msgstr ""

msgid "Run"
msgstr ""

msgid "Run to get results"
msgstr ""

msgid "Activity Level"
msgstr ""

Expand All @@ -215,34 +226,7 @@ msgstr ""
msgid "Enrolled"
msgstr ""

msgid "Configuration"
msgstr ""

msgid "Outliers"
msgstr ""

msgid "Trends"
msgstr ""

msgid "Disaggregates"
msgstr ""

msgid "General Practitioners"
msgstr ""

msgid "Nursing"
msgstr ""

msgid "Nursing/Midwifery"
msgstr ""

msgid "Midwifery"
msgstr ""

msgid "Density"
msgstr ""

msgid "Other"
msgid "No Issues found"
msgstr ""

msgid "Are you sure you want to {{action}} the selected rows?"
Expand Down
94 changes: 38 additions & 56 deletions i18n/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-03-14T01:55:56.426Z\n"
"POT-Creation-Date: 2024-03-16T16:23:42.597Z\n"
"PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -59,6 +59,11 @@ msgstr ""
msgid "Save Config Analysis"
msgstr ""

msgid ""
"No user with Capture rights and Organisation Unit associated to the issue "
"was found"
msgstr ""

msgid "Updating Issue..."
msgstr ""

Expand All @@ -74,6 +79,30 @@ msgstr ""
msgid "Double click to edit"
msgstr ""

msgid "Yes"
msgstr ""

msgid "No"
msgstr ""

msgid "{{countryNames}} and {{moreCountriesCount}} more"
msgstr ""

msgid "Close"
msgstr ""

msgid "Countries"
msgstr ""

msgid "Periods"
msgstr ""

msgid "Action"
msgstr ""

msgid "Follow Up"
msgstr ""

msgid "Issue"
msgstr ""

Expand All @@ -95,12 +124,6 @@ msgstr ""
msgid "Azure URL"
msgstr ""

msgid "Follow Up"
msgstr ""

msgid "Action"
msgstr ""

msgid "Contact Emails"
msgstr ""

Expand Down Expand Up @@ -146,8 +169,7 @@ msgstr ""
msgid "Data Quality Analysis"
msgstr ""

msgid ""
"Outliers detection analysis based on DHIS2 min-max standard functionality"
msgid "Configuration"
msgstr ""

msgid "Algorithm"
Expand All @@ -156,43 +178,30 @@ msgstr ""
msgid "Threshold"
msgstr ""

msgid "Run"
msgstr ""

msgid "Run to get results"
msgstr ""

msgid "No Issues found"
msgstr ""

msgid "Running analysis..."
msgstr ""

msgid "Missing disaggregates in selected catcombos"
msgstr ""

msgid "CatCombos"
msgstr ""

msgid ""
"Medical doctors analysis: General Practicioners missing and double counts"
msgstr ""

msgid "Disaggregations"
msgstr ""

msgid "Double Counts Threshold"
msgstr ""

msgid "Missing nursing personnel when midwifery personnel is present"
msgstr ""

msgid "Loading"
msgstr ""

msgid "Validation Rule Group"
msgstr ""

msgid "Run"
msgstr ""

msgid "Run to get results"
msgstr ""

msgid "Activity Level"
msgstr ""

Expand All @@ -217,34 +226,7 @@ msgstr ""
msgid "Enrolled"
msgstr ""

msgid "Configuration"
msgstr ""

msgid "Outliers"
msgstr ""

msgid "Trends"
msgstr ""

msgid "Disaggregates"
msgstr ""

msgid "General Practitioners"
msgstr ""

msgid "Nursing"
msgstr ""

msgid "Nursing/Midwifery"
msgstr ""

msgid "Midwifery"
msgstr ""

msgid "Density"
msgstr ""

msgid "Other"
msgid "No Issues found"
msgstr ""

msgid "Are you sure you want to {{action}} the selected rows?"
Expand Down
8 changes: 7 additions & 1 deletion src/CompositionRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,13 @@ function getCompositionRoot(repositories: Repositories, metadata: MetadataItem)
repositories.settingsRepository
),
},
issues: { save: new SaveIssueUseCase(repositories.qualityAnalysisRepository, metadata) },
issues: {
save: new SaveIssueUseCase(
repositories.qualityAnalysisRepository,
repositories.usersRepository,
metadata
),
},
settings: { get: new GetSettingsUseCase(repositories.settingsRepository) },
nursingMidwifery: {
getDisaggregations: new GetMidwiferyPersonnelDisaggregationsUseCase(
Expand Down
21 changes: 14 additions & 7 deletions src/data/common/D2CategoryOption.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { FutureData, apiToFuture } from "../api-futures";
import { Id } from "../../domain/entities/Ref";
import _ from "../../domain/entities/generic/Collection";
import { CategoryOption } from "../../domain/entities/CategoryOption";
import { Maybe } from "$/utils/ts-utils";

export class D2CategoryOption {
constructor(private api: D2Api) {}
Expand All @@ -21,15 +22,21 @@ export class D2CategoryOption {
})
.map(d2Response => {
return d2Response.data.objects.map(d2CategoryOption => {
return {
id: d2CategoryOption.id,
name:
d2CategoryOption.displayShortName ||
d2CategoryOption.displayFormName ||
d2CategoryOption.displayName,
};
return { id: d2CategoryOption.id, name: this.getName(d2CategoryOption) };
});
})
);
}

private getName(d2Name: D2TranslatioName): string {
const name = d2Name.displayShortName || d2Name.displayFormName || d2Name.displayName;
if (name === "default") return "Total";
return name || "";
}
}

type D2TranslatioName = {
displayShortName: Maybe<string>;
displayFormName: Maybe<string>;
displayName: Maybe<string>;
};
Loading
Loading