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.

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

merge: update branch with latest dev #5952

Merged
merged 42 commits into from
Oct 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c16337d
fix(centralServer): Handle request access without project code
alexd-bes Sep 17, 2024
a8f97ea
fix(tupaiaWeb): Fix button styling
alexd-bes Sep 17, 2024
afacbdf
fix(centralServer): Disable automatic cell conversion
hrazasalman Sep 18, 2024
88f89dd
fix(lesmis): Fix blank dashboard
hrazasalman Sep 18, 2024
22ce0a5
fix(lesmis): fix blank dashboard
hrazasalman Sep 18, 2024
40444a4
fix project detail loader
hrazasalman Sep 19, 2024
b8ff7ed
fix(adminPanel): Fix colours in admin panel filter tables
alexd-bes Sep 20, 2024
876e996
fix(adminPanel): Fix import modal in viz builder
alexd-bes Sep 20, 2024
4a737f4
fix(adminPanel): Fix entity type for measure level
alexd-bes Sep 20, 2024
abfda67
fix(datatrakWeb): Fix report survey filtering
alexd-bes Sep 20, 2024
9c6d757
fix(datatrakWeb): Fix changing search value
alexd-bes Sep 20, 2024
798e313
Update buildDeployablePackages.sh
tcaiger Sep 20, 2024
01a911a
Merge pull request #5907 from beyondessential/release-2024-38
hrazasalman Sep 22, 2024
e7ab998
Merge pull request #5915 from beyondessential/merge-release-2024-38
hrazasalman Sep 22, 2024
5c06247
feat(tupaiaWeb): RN-1413: Enable projects search by country (#5890)
alexd-bes Sep 25, 2024
3c72db9
feat(tupaiaWeb): RN-1304: Date offsets for year granularities (#5695)
alexd-bes Sep 26, 2024
5293c2a
feat(adminPanel): RN-1433: Allow archiving of survey responses (#5903)
alexd-bes Sep 26, 2024
1026e43
fix(datatrakWeb): RN-1483: Fix issue with code gen replacing saved va…
alexd-bes Sep 27, 2024
eac9381
tweak(datatrakWeb): RN-1429: Hide Waka on mobile Datatrak Web (#5914)
alexd-bes Sep 29, 2024
b7bd762
tweak(config): Add support for hot reloading on internal deps changes…
alexd-bes Sep 29, 2024
21d1e43
tweak(datatrakWeb): RN-1426: Shift activity feed upwards when less th…
alexd-bes Sep 29, 2024
db4bac2
tweak(tupaiaWeb): RN-1445: Update request access flow (#5901)
alexd-bes Sep 29, 2024
ccac2f9
fix(tests): Fix broken timezone tests after DST changes (#5927)
alexd-bes Sep 29, 2024
33a2dfe
fix(datatrakWeb): RN-1484: Fix autocomplete question not sticking (#5…
alexd-bes Sep 29, 2024
8c56499
fix(datatrakWeb): RN-1454: Don't show all entities when no value in r…
alexd-bes Sep 29, 2024
d02206f
tweak(adminPanel): RN-1456: Allow export of archived survey responses…
alexd-bes Sep 30, 2024
d046bf8
fix(adminPanel): RN-1397: Filtering by sort order result inconsistenc…
hrazasalman Sep 30, 2024
64356c1
tweak(adminPanel): RN-1427: Remove .CSV from supported file types (#5…
hrazasalman Sep 30, 2024
91fb98d
fix(adminPanel): RN-1396: Entity import wipes attributes if attribute…
hrazasalman Sep 30, 2024
b915598
fix(datatrakWeb): RN-1484: Fix autocomplete stickiness
alexd-bes Sep 30, 2024
c9bb5f2
feat(datatrakWeb): RN-1485: Add GA events for task created (#5931)
alexd-bes Sep 30, 2024
6a5f35b
useColumnFilters
tcaiger Oct 1, 2024
894de0d
fix(tupaiaWeb): Fix date picker for years
alexd-bes Oct 1, 2024
16f3d94
fix(tupaiaWeb): Fix year picker
alexd-bes Oct 1, 2024
019e50c
Merge pull request #5932 from beyondessential/release-2024-40
tcaiger Oct 2, 2024
12e1b16
Merge pull request #5937 from beyondessential/master
tcaiger Oct 2, 2024
be5a588
feat(tupaiaWeb): RN-1402: Ability to generate continuous PDF for dash…
alexd-bes Oct 3, 2024
5d56aff
fix(adminPanel): RN-1475: Fix entity import (#5912)
tcaiger Oct 4, 2024
60ce162
fix(adminPanel): RN-1496: Fix export button (#5943)
tcaiger Oct 4, 2024
84846fa
tweak(datatrak): RN-1492: Save last login date of meditrak devices (#…
tcaiger Oct 6, 2024
2fa1912
feat(tupaiaWeb): RN-1371: QR code scanner (#5892)
alexd-bes Oct 7, 2024
f826f25
fix(adminPanel): RN-1496: Roll back download button change (#5949)
tcaiger Oct 8, 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
Prev Previous commit
Next Next commit
fix(datatrakWeb): Fix report survey filtering
alexd-bes committed Sep 20, 2024
commit abfda678e27227f2fdfb804525aea1e0c9d75c87
14 changes: 10 additions & 4 deletions packages/datatrak-web-server/src/routes/SurveysRoute.ts
Original file line number Diff line number Diff line change
@@ -25,11 +25,17 @@ export class SurveysRoute extends Route<SurveysRequest> {
const { fields = [], projectId, countryCode } = query;
const country = await models.country.findOne({ code: countryCode });

const surveys = await ctx.services.central.fetchResources(`countries/${country.id}/surveys`, {
const queryUrl = countryCode ? `countries/${country.id}/surveys` : 'surveys';

const filter: Record<string, string> = {};

if (projectId) {
filter.project_id = projectId;
}

const surveys = await ctx.services.central.fetchResources(queryUrl, {
...query,
filter: {
project_id: projectId,
},
filter,
columns: fields,
pageSize: 'ALL', // Override default page size of 100
});