Merge pull request #785 from BIDMCDigitalPsychiatry/issue-777

survey percentage settings - QA fix
BIDMCDigitalPsychiatry · Oct 12, 2023 · 5bf8aae · 5bf8aae
2 parents 6dc86b6 + cb2df2e
commit 5bf8aae
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/components/PreventSelectedActivities.tsx b/src/components/PreventSelectedActivities.tsx
@@ -252,17 +252,25 @@ export const strategies = {
 
 const getPercentageSettings = async (participantId, activities: ActivityObj[]) => {
   let percentage = []
+  let activityEvents = await LAMP.ActivityEvent.allByParticipant(participantId)
   return await Promise.all(
     percentage.concat(
       activities.map(async (activity) => {
         let tag = [await LAMP.Type.getAttachment(activity.id, "lamp.dashboard.percentage_settings")].map((y: any) =>
           !!y.error ? undefined : y.data
         )[0]
         const endTime = getEndTime(tag)
-        let activityEvents = await LAMP.ActivityEvent.allByParticipant(participantId, null, tag.startDate, endTime)
         return {
           activityId: activity.id,
-          percentage: Math.round((activityEvents.length / tag.limit) * 100 * 100) / 100,
+          percentage:
+            Math.round(
+              (activityEvents.filter(
+                (a) => a.activity === activity.id && a.timestamp >= tag.startDate && a.timestamp <= endTime
+              ).length /
+                tag.limit) *
+                100 *
+                100
+            ) / 100,
         }
       })
     )