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

EDU-810 Friendly message in case we got no recommendations for the adaptive course

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-01-11 16:15:46 +03:00
parent 37320e074a
commit 0b29608d59
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+4
View File
@@ -848,4 +848,8 @@ public class StudyUtils {
final int endOffset = startOffset + length + delta;
return Pair.create(startOffset, endOffset);
}
public static boolean isCourseValid(@Nullable Course course) {
return course != null && !(course.isAdaptive() && course.getLessons().isEmpty());
}
}
python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
+5 -1
View File
@@ -93,6 +93,10 @@ public class StudyProjectGenerator {
Messages.showWarningDialog("Some problems occurred while creating the course", "Error in Course Creation");
return;
}
else if (course.isAdaptive() && course.getLessons().isEmpty()) {
Messages.showWarningDialog("There is no recommended tasks for this adaptive course", "Error in Course Creation");
return;
}
final File courseDirectory = StudyUtils.getCourseDirectory(course);
StudyTaskManager.getInstance(project).setCourse(course);
ApplicationManager.getApplication().runWriteAction(() -> {
@@ -135,7 +139,7 @@ public class StudyProjectGenerator {
ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
return execCancelable(() -> {
final Course course = EduStepicConnector.getCourse(project, mySelectedCourseInfo);
if (course != null) {
if (StudyUtils.isCourseValid(course)) {
flushCourse(course);
course.initCourse(false);
}
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
+4 -7
View File
@@ -212,19 +212,16 @@ public class EduStepicConnector {
}
}
else {
final Lesson lesson = new Lesson();
course.setName(info.getName());
//TODO: more specific name?
lesson.setName("Adaptive");
course.addLesson(lesson);
final Task recommendation = EduAdaptiveStepicConnector.getNextRecommendation(project, course);
if (recommendation != null) {
final Lesson lesson = new Lesson();
lesson.setName("Adaptive");
course.addLesson(lesson);
lesson.addTask(recommendation);
return course;
}
else {
return null;
}
return course;
}
return null;
}