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

M2-5308: Fixed DONE UserEvent is not being sent bug #384

Merged
merged 21 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7986acd
feat: M2-5117 added data-testIds
vmkhitaryanscn Feb 9, 2024
58d424a
M2-5007 Restart resume feature: Added restart/resume buttons to Activ…
vmkhitaryanscn Feb 9, 2024
bdd5ac8
M2-5007 Restart resume feature: Added data-testIds
vmkhitaryanscn Feb 9, 2024
e37a1d8
bug: M2-5043 updated conditional logic , ignoring all the skipped and…
vmkhitaryanscn Feb 14, 2024
890d550
bug: M2-5260 Fixed default answers for hidden activities, removing co…
vmkhitaryanscn Feb 15, 2024
76a1e2a
bug: M2-5260 Code improvements
vmkhitaryanscn Feb 15, 2024
79d7508
bug: M2-5043 Storing ids of conditionally hidden items to be used for…
vmkhitaryanscn Feb 15, 2024
69918b8
M2-5293: mapping time, date and timeRange answers to UserEventsDTO
vmkhitaryanscn Feb 16, 2024
354e063
Merge pull request #375 from ChildMindInstitute/bug-2.5/M2-5260
vmkhitaryanscn Feb 16, 2024
5badca6
Merge pull request #374 from ChildMindInstitute/bug-2.5/M2-5043
vmkhitaryanscn Feb 16, 2024
b6e5d3a
Merge pull request #371 from ChildMindInstitute/feat/M2-5007
vmkhitaryanscn Feb 16, 2024
249d9b0
Merge pull request #376 from ChildMindInstitute/bug-2.5/M2-5293
vmkhitaryanscn Feb 16, 2024
a4a5b24
M2-5293: validating date and time items values before passing to acti…
vmkhitaryanscn Feb 16, 2024
91c2857
M2-5022: preventing user to skip the audio player if it is not skippable
vmkhitaryanscn Feb 19, 2024
f0b84b0
Merge pull request #379 from ChildMindInstitute/bug-2.5/M2-5022
moiskillnadne Feb 19, 2024
dfd887c
Merge pull request #377 from ChildMindInstitute/bug-2.5/M2-5293
moiskillnadne Feb 19, 2024
ad3b212
Update year in the footer
Feb 20, 2024
1b904af
Fix activityCard layout when loading status
Feb 20, 2024
d66b1e2
Merge pull request #380 from ChildMindInstitute/feature/M2-5011
moiskillnadne Feb 20, 2024
65b4376
M2-5308: Fixed DONE User-event is not being sent bug
vmkhitaryanscn Feb 21, 2024
d385924
Merge branch 'dev2.5' into bug-2.5/M2-5308
vmkhitaryanscn Feb 22, 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
14 changes: 9 additions & 5 deletions src/entities/applet/model/hooks/useUserEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,22 @@ export const useUserEvents = (props: Props) => {
(type: UserEventTypes, item: ItemRecord) => {
const activityItemScreenId = getActivityItemScreenId(props.activityId, item.id)

const newUserEvent = {
type,
screen: activityItemScreenId,
time: Date.now(),
}

dispatch(
actions.saveUserEvent({
entityId: props.activityId,
eventId: props.eventId,
itemId: item.id,
userEvent: {
type,
screen: activityItemScreenId,
time: Date.now(),
},
userEvent: newUserEvent,
}),
)

return newUserEvent
},
[dispatch, props.activityId, props.eventId],
)
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/ActivityDetails/ui/AssessmentPassingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ export const AssessmentPassingScreen = (props: Props) => {
})

const onSubmit = useCallback(() => {
saveUserEventByType("DONE", item)
const doneUserEvent = saveUserEventByType("DONE", item)

const answer = processAnswers({
items,
userEvents,
userEvents: [...userEvents, doneUserEvent],
isPublic: context.isPublic,
})

Expand Down