add subtasks to placeholder inner representation

This commit is contained in:
Liana Bakradze
2016-11-17 17:05:02 +03:00
committed by liana.bakradze
parent fbf0e2ce8a
commit 0b5b593874
23 changed files with 229 additions and 122 deletions
@@ -72,7 +72,7 @@ public class PyCCCommandLineState extends PythonCommandLineState {
private String getFirstTaskFilePath() {
for (Map.Entry<String, TaskFile> entry : myTask.getTaskFiles().entrySet()) {
String path = getTaskFilePath(entry.getKey());
if (!entry.getValue().getAnswerPlaceholders().isEmpty()) {
if (!entry.getValue().getActivePlaceholders().isEmpty()) {
return path;
}
VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(path);
@@ -101,7 +101,7 @@ public class PyStudyCheckAction extends StudyCheckAction {
for (Map.Entry<String, TaskFile> entry : myTask.getTaskFiles().entrySet()) {
final String name = entry.getKey();
final TaskFile taskFile = entry.getValue();
if (taskFile.getAnswerPlaceholders().size() < 2) {
if (taskFile.getActivePlaceholders().size() < 2) {
continue;
}
final Course course = myTaskManger.getCourse();
@@ -141,7 +141,7 @@ public class PyStudyCheckAction extends StudyCheckAction {
TaskFile taskFile = entry.getValue();
VirtualFile virtualFile = taskDir.findChild(name);
if (virtualFile != null) {
if (!taskFile.getAnswerPlaceholders().isEmpty()) {
if (!taskFile.getActivePlaceholders().isEmpty()) {
taskVirtualFile = virtualFile;
}
}