MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

take into account subtasks for course progress bar

Browse Source 
this is done only for courses with one lesson and one task
This commit is contained in:
Ekaterina Tuzova
2016-11-25 18:24:24 +03:00
parent 1cdb2d07bf
commit 86cba1b8e1
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
+17 -9
View File
@@ -77,10 +77,10 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
if (isToolwindow && course != null && course.isAdaptive()) {
panel.add(new StepicAdaptiveReactionsPanel(project), BorderLayout.NORTH);
}
JComponent taskInfoPanel = createTaskInfoPanel(project);
panel.add(taskInfoPanel, BorderLayout.CENTER);
final JPanel courseProgress = createCourseProgress(project);
if (isToolwindow && course != null && !course.isAdaptive() && EduNames.STUDY.equals(course.getCourseMode())) {
panel.add(courseProgress, BorderLayout.SOUTH);
@@ -92,7 +92,7 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
myCardLayout.show(myContentPanel, TASK_INFO_ID);
setContent(mySplitPane);
if (isToolwindow) {
StudyPluginConfigurator configurator = StudyUtils.getConfigurator(project);
if (configurator != null) {
@@ -113,11 +113,11 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
}
}
}
public void setTopComponent(@NotNull final JComponent component) {
mySplitPane.setFirstComponent(component);
}
public void setDefaultTopComponent() {
mySplitPane.setFirstComponent(myContentPanel);
}
@@ -297,10 +297,18 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
int taskNum = 0;
int taskSolved = 0;
List<Lesson> lessons = course.getLessons();
for (Lesson lesson : lessons) {
if (lesson.getName().equals(EduNames.PYCHARM_ADDITIONAL)) continue;
taskNum += lesson.getTaskList().size();
taskSolved += getSolvedTasks(lesson);
if (lessons.size() == 1 && lessons.get(0).getTaskList().size() == 1) {
final Lesson lesson = lessons.get(0);
final Task task = lesson.getTaskList().get(0);
taskNum += task.getLastSubtaskIndex() + 1;
taskSolved += task.getActiveSubtaskIndex();
}
else {
for (Lesson lesson : lessons) {
if (lesson.getName().equals(EduNames.PYCHARM_ADDITIONAL)) continue;
taskNum += lesson.getTaskList().size();
taskSolved += getSolvedTasks(lesson);
}
}
String completedTasks = String.format("%d of %d tasks completed", taskSolved, taskNum);
double percent = (taskSolved * 100.0) / taskNum;