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

Jump to bottom

Fix/staging bugs #1810

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Fix/staging bugs #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a762d5c
fix(qrcode): increase qrcode size
NSUWAL123 Sep 26, 2024
4d61cd2
fix(dialogTaskActions): add task id filter on odk redirect
NSUWAL123 Sep 26, 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
2 changes: 1 addition & 1 deletion src/frontend/src/components/DialogTaskActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export default function Dialog({ taskId, feature }: dialogPropType) {
);

if (isMobile) {
document.location.href = `odkcollect://form/${projectInfo.xform_id}`;
document.location.href = `odkcollect://form/${projectInfo.xform_id}?task_filter=${taskId}`;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually removed intentionally, as I deemed the task_filter param to be unnecessary - it confused things I think!

The custom ODK Collect should be default, then backup users can just select the geom they are standing next too quite easily with geolocation

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manjitapandey not sure if you agree, but I think it's ok for 'Go to ODK' to just open the unfilled form

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, when users access ODK at the task level, they are presented with all the project's features, which may cause confusion as they likely expect to see only the features relevant to the specific task. Skipping the task-specific question might not be a good idea in this context.

Copy link
Member

@spwoodcock spwoodcock Sep 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But should we actually even have that as a flow? The main one we should target is building selection, not task id selection.

From what I have seen actual mapping in practice is that the task id selection question is a source of confusion. Perhaps we should get some feedback from recent users.

I personally don't see it as much of an issue having the buildings loaded for users in the field. I agree it's difficult to select a building on a remote computer with no geolocation, but when in the field you are geolocated to show a dot next to the building to be mapped

} else {
dispatch(
CommonActions.SetSnackBar({
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/components/ProjectDetailsV2/MapControlComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const MapControlComponent = ({ map, projectName, pmTileLayerData }: mapControlCo
};

return (
<div className="fmtm-absolute fmtm-top-4 sm:fmtm-top-56 fmtm-right-3 fmtm-z-[99] fmtm-flex fmtm-flex-col fmtm-gap-4">
<div className="fmtm-absolute fmtm-top-4 sm:fmtm-top-[14.5rem] fmtm-right-3 fmtm-z-[99] fmtm-flex fmtm-flex-col fmtm-gap-4">
{btnList.map((btn) => (
<Tooltip title={btn.title} placement="left">
<div
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/components/QrcodeComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const QrcodeComponent = ({ projectId, taskIndex }: tasksComponentType) => {

return (
<div className="fmtm-flex fmtm-justify-center sm:fmtm-py-5 fmtm-border-t-[1px]">
<div className="fmtm-relative fmtm-hidden sm:fmtm-block fmtm-bg-white fmtm-p-2 !fmtm-w-[8.5rem] fmtm-rounded-tl-lg fmtm-rounded-bl-lg">
<div className="fmtm-relative fmtm-hidden sm:fmtm-block fmtm-bg-white fmtm-p-2 !fmtm-w-[9rem] fmtm-rounded-tl-lg fmtm-rounded-bl-lg">
{qrcode == '' ? (
<CoreModules.Skeleton width={170} height={170} />
) : (
Expand Down
Loading