Skip to content

progress bar completed questions/total questions in lesson #76

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

Open
divyakatyal wants to merge 3 commits into
base: main
Choose a base branch
from
Open

progress bar completed questions/total questions in lesson #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5a2ec2
progress bar completed questions/total questions in lesson
divyakatyal Jun 17, 2025
43d272b
progress bar completed questions/total questions in lesson
divyakatyal Jun 25, 2025
907b44b
fixed mastery
divyakatyal Jun 25, 2025
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
Binary file added public/static/images/icons/progress-avatar.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/images/icons/progress-bar-bg.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/images/icons/progress-bar-fill.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 14 additions & 11 deletions src/components/problem-layout/Problem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,19 +336,19 @@ class Problem extends React.Component {
}
};

clickNextProblem = async () => {
scroll.scrollToTop({ duration: 900, smooth: true });
clickNextProblem = async () => {
scroll.scrollToTop({ duration: 900, smooth: true });

await this.props.problemComplete(this.context);
await this.props.problemComplete(this.context);

this.setState({
stepStates: {},
firstAttempts: {},
problemFinished: false,
feedback: "",
feedbackSubmitted: false,
});
};
this.setState({
stepStates: {},
firstAttempts: {},
problemFinished: false,
feedback: "",
feedbackSubmitted: false,
});
};

submitFeedback = () => {
const { problem } = this.props;
Expand Down Expand Up @@ -429,6 +429,9 @@ class Problem extends React.Component {

render() {
const { translate } = this.props;
const { progressInfo } = this.props;
const total = progressInfo?.total || 0;
const completed = progressInfo?.completed || 0;
const { classes, problem, seed } = this.props;
const [oerLink, oerName, licenseLink, licenseName] =
this.getOerLicense();
Expand Down
2 changes: 1 addition & 1 deletion src/content-sources/oatutor
Open in desktop
Submodule oatutor updated from 270ce0 to 74e419
94 changes: 89 additions & 5 deletions src/platform-logic/Platform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Platform extends React.Component {

constructor(props, context) {
super(props);

this.problemIndex = {
problems: problemPool,
};
Expand Down Expand Up @@ -78,7 +78,7 @@ class Platform extends React.Component {
componentDidMount() {
this._isMounted = true;
if (this.props.lessonID != null) {
console.log("calling selectLesson from componentDidMount...")
console.log("calling selectLesson from componentDidMount...")
const lesson = findLessonById(this.props.lessonID)
console.debug("lesson: ", lesson)
this.selectLesson(lesson).then(
Expand Down Expand Up @@ -112,7 +112,7 @@ class Platform extends React.Component {
this.onComponentUpdate(prevProps, prevState, snapshot);
}


onComponentUpdate(prevProps, prevState, snapshot) {
if (
Boolean(this.state.currProblem?.id) &&
Expand All @@ -124,7 +124,7 @@ class Platform extends React.Component {
this.context.problemID = "n/a";
}
}

async selectLesson(lesson, updateServer=true) {
const context = this.context;
console.debug("lesson: ", context)
Expand Down Expand Up @@ -230,6 +230,10 @@ class Platform extends React.Component {
}

this.lesson = lesson;
const lessonName = String(lesson.name.replace("Lesson ", "") + " " + lesson.topics);
this.lessonProblems = this.problemIndex.problems
.filter(({ lesson: probLesson }) => String(probLesson).includes(lessonName))
.sort((a, b) => a.id.localeCompare(b.id));

const loadLessonProgress = async () => {
const { getByKey } = this.context.browserStorage;
Expand Down Expand Up @@ -498,8 +502,88 @@ class Platform extends React.Component {
componentName={"Problem"}
descriptor={"problem"}
>
{this.lessonProblems?.length > 0 && (() => {
const progressPercent = this.completedProbs.size / this.lessonProblems.length;
const mascotLeft = Math.max(0, progressPercent * 888 - 44);

return (
<div style={{ display: "flex", justifyContent: "center", margin: "24px 0" }}>
<div
style={{
display: "flex",
flexDirection: "row",
alignItems: "center",
width: "1112px",
padding: "16px 0",
gap: "12px",
}}
>
<div
style={{
fontSize: "16px",
fontWeight: 600,
lineHeight: "24px",
width: "156px",
}}
>
Question {this.completedProbs.size}/{this.lessonProblems.length}
</div>
<div style={{ position: "relative", width: "888px", height: "48px" }}>
<img
src="/place-holder/static/images/icons/progress-bar-bg.png"
alt="Progress bar background"
style={{
position: "absolute",
top: 0,
left: 0,
width: "888px",
height: "48px",
zIndex: 1,
}}
/>
<div
style={{
position: "absolute",
top: "3px",
left: "3px",
width: `${progressPercent * 888}px`,
height: "42px",
overflow: "hidden",
borderRadius: "99px",
zIndex: 2,
}}
>
<img
src="/place-holder/static/images/icons/progress-bar-fill.png"
alt="Progress bar fill"
style={{
width: "352px",
height: "42px",
objectFit: "cover",
}}
/>
<img
src="/place-holder/static/images/icons/progress-avatar.png"
alt="Progress mascot"
style={{
position: "absolute",
top: "1px",
left: `${mascotLeft}px`,
width: "40px",
height: "40px",
transform: "rotate(180deg)",
transition: "left 0.3s ease-in-out",
zIndex: 3,
}}
/>
</div>
</div>
</div>
</div>
);
})()}
<ProblemWrapper
problem={this.state.currProblem}
problem={this.state.currProblem}
problemComplete={this.problemComplete}
lesson={this.lesson}
seed={this.state.seed}
Expand Down