Commit 29a7ed91 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '893-analyst-overview-improve-team-counts-in-la' into 'main' 

Improve team counts in LA in Analyst

Closes #893

See merge request inject/frontend!924
parents 1cdf8265 4221c689

frontend/src/components/LabeledProgressBar/index.tsx

+52 −44
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ interface LabeledProgressBarProps { 
    labelIcon?: IconName

    achieved: number

    total: number

    valueTooltip?: string

  }[]

  minimal?: boolean

  fill?: boolean
@@ -60,7 +61,8 @@ export const LabeledProgressBar: FC<LabeledProgressBarProps> = ({ 
      value={achieved / total}

      intent={getIntent(achieved / total)}

    />

    {labels.map(({ label, labelIcon, achieved, total }, index) => (

    {labels.map(

      ({ label, labelIcon, achieved, total, valueTooltip }, index) => (

        <span

          key={`${label}-${labelIcon ?? 'no-icon'}-${index}`}

          className={css`
@@ -103,7 +105,13 @@ export const LabeledProgressBar: FC<LabeledProgressBarProps> = ({ 
          <span>

            {labelIcon ? `${achieved}/${total}` : `${achieved} / ${total}`}

          </span>

          {valueTooltip && (

            <Tooltip content={valueTooltip} interactionKind='hover-target'>

              <Icon icon='small-info-sign' className={Classes.TEXT_MUTED} />

            </Tooltip>

          )}

        </span>

    ))}

      )

    )}

  </div>

)

frontend/src/components/Overview/LearningObjectives/LearningActivity.tsx

+12 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ const LearningActivity: FC<LearningActivityProps> = ({ 


  const totalTeams = teamLearningActivities.length

  const reachedTeams = teamLearningActivities.filter(obj => obj.reached).length

  const activityLength =

    'milestones' in activity

      ? (activity as IActivityWithTeamStates).milestones.length

      : undefined



  const score = teamLearningActivities[0].totalScore
@@ -62,6 +66,14 @@ const LearningActivity: FC<LearningActivityProps> = ({ 
                  label: 'Teams',

                  achieved: reachedTeams,

                  total: totalTeams,

                  valueTooltip:

                    activityLength !== undefined

                      ? `Number of teams that completed ${

                          activityLength > 1

                            ? `all milestones (${activityLength})`

                            : 'the milestone'

                        } in this activity.`

                      : 'Number of teams that completed all milestones in this activity.',

                },

              ]}

              achieved={reachedTeams}

frontend/src/components/Overview/LearningObjectives/LearningObjective.tsx

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ export const LearningObjective: FC<LearningObjectiveProps> = ({ 
                  label: 'Teams',

                  achieved: reachedTeams,

                  total: totalTeams,

                  valueTooltip: `Number of teams that completed ${

                    objective.activities.length > 1

                      ? `all activities (${objective.activities.length})`

                      : 'the activity'

                  } in this objective`,

                },

              ]}

              achieved={reachedTeams}