Summary chooser demo

.gitignore

@@ -1,6 +1,7 @@
 
 ### Maven spring - downloaded with initial project from Spring Intitializer - https://start.spring.io/ ###
 /target/
+/parui/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###

pom.xml

@@ -30,10 +30,6 @@
             <artifactId>opencsv</artifactId>
             <version>4.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -96,6 +92,17 @@
             <version>2.14.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>11</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
 
     </dependencies>
 
@@ -116,6 +123,68 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
+            <!-- To build the react front end code   -->
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.12.0</version>
+                <configuration>
+                    <workingDirectory>parui</workingDirectory>
+                    <installDirectory>target</installDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <nodeVersion>v14.16.0</nodeVersion>
+                            <npmVersion>6.14.11</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm run build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <copy todir="${project.build.directory}/classes/public">
+                                    <fileset dir="${project.basedir}/parui/build"/>
+                                </copy>
+                                <mkdir dir="${project.build.directory}/localData/student"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

server install steps.txt

@@ -10,9 +10,9 @@ mvn test
 ps -A | grep java
 sudo kill PID
 
-tar cvzf "../dataBackup/parDataBackup-2021-02-10.tar.gz" target/localData/
+tar cvzf "../dataBackup/parDataBackup-2021-06-15.tar.gz" target/localData/
 on local:
-scp <username>@par.eastus.cloudapp.azure.com:dataBackup/parDataBackup--2021-02-10.tar.gz Downloads/
+scp <username>@par.eastus.cloudapp.azure.com:dataBackup/parDataBackup--2021-06-15.tar.gz Downloads/
     remote if clearing data:
         rm -f target/localData/*.json
         rm -f target/localData/students/*.json

src/main/java/edu/ithaca/dragon/par/ParServer.java

@@ -1,12 +1,16 @@
 package edu.ithaca.dragon.par;
 
+import java.util.Collection;
 import java.util.List;
 
+import edu.ithaca.dragon.par.analysis.QuestionHistorySummary;
 import edu.ithaca.dragon.par.cohort.Cohort;
 import edu.ithaca.dragon.par.cohort.CohortDatasource;
 import edu.ithaca.dragon.par.domain.Question;
 import edu.ithaca.dragon.par.domain.DomainDatasource;
 import edu.ithaca.dragon.par.student.StudentModelDatasource;
+import edu.ithaca.dragon.par.student.json.QuestionHistory;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -32,6 +36,11 @@ public List<String> getCohortIds(){
         return cohortDatasource.getCohortIds();
     }
 
+    public QuestionHistorySummary getQuestionHistorySummary(String studentId){    
+        logger.info("QuestionHistorySummary for:" + studentId);    
+        return new QuestionHistorySummary(studentModelDatasource.getStudentModel(studentId).getQuestionHistories().values(), domainDatasource);
+    }
+
     public void addNewUser(String studentId, String cohortId){
         studentModelDatasource.createNewModelForId(studentId);
         cohortDatasource.addStudentToCohort(cohortId, studentId);

src/main/java/edu/ithaca/dragon/par/analysis/QuestionHistorySummary.java

@@ -12,18 +12,18 @@
 //TODO: can make these: across everyone for all types or certain type, for 1 student for all types or certain type, window size too
 public class QuestionHistorySummary {
     private List<String> questionIdsSeen;
-    private List<String> questionsRespondedTo;
-    private List<String> questionsCorrect;
-    private List<String> questionsCorrectAfterIncorrect;
-    private List<String> questionsIncorrect;
+    private List<String> questionIdsRespondedTo;
+    private List<String> questionIdsCorrectFirstTime;
+    private List<String> questionIdsCorrectAfterIncorrect;
+    private List<String> questionIdsIncorrect;
 
 
     public QuestionHistorySummary(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
         questionIdsSeen = buildQuestionIdsSeen(questionHistoryCollection);
-        questionsRespondedTo = checkQuestionsRespondedTo(questionHistoryCollection);
-        questionsCorrect = findQuestionsCorrect(questionHistoryCollection, domainData);
-        questionsIncorrect = findQuestionsIncorrect(questionHistoryCollection, domainData);
-        questionsCorrectAfterIncorrect = findQuestionsCorrectAfterIncorrect(questionHistoryCollection, domainData);
+        questionIdsRespondedTo = checkQuestionIdsRespondedTo(questionHistoryCollection);
+        questionIdsCorrectFirstTime = findQuestionIdsCorrectFirstTime(questionHistoryCollection, domainData);
+        questionIdsIncorrect = findQuestionIdsIncorrect(questionHistoryCollection, domainData);
+        questionIdsCorrectAfterIncorrect = findQuestionIdsCorrectAfterIncorrect(questionHistoryCollection, domainData);
     }
 
     public static List<String> buildQuestionIdsSeen(Collection<QuestionHistory> questionHistoryCollection){
@@ -40,7 +40,7 @@ public static List<String> buildQuestionIdsSeen(Collection<QuestionHistory> ques
         return questionIdsList;
     }
 
-    public static List<String> checkQuestionsRespondedTo(Collection<QuestionHistory> questionHistoryCollection){
+    public static List<String> checkQuestionIdsRespondedTo(Collection<QuestionHistory> questionHistoryCollection){
         List<String> questionsRespondedList = new ArrayList<String>();
 
         for(QuestionHistory questionHist : questionHistoryCollection){
@@ -51,7 +51,7 @@ public static List<String> checkQuestionsRespondedTo(Collection<QuestionHistory>
         return questionsRespondedList;
     }
 
-    public static List<String> findQuestionsCorrect(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
+    public static List<String> findQuestionIdsCorrectFirstTime(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
         List<String> correctList = new ArrayList<String>();
         List<QuestionHistory> historyOfQuestions = QuestionHistorySummary.findAllHistoriesWithResponses(questionHistoryCollection);
 
@@ -65,28 +65,35 @@ public static List<String> findQuestionsCorrect(Collection<QuestionHistory> ques
         return correctList;
     }
 
-    public static List<String> findQuestionsIncorrect(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
+    public static List<String> findQuestionIdsIncorrect(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
         List<String> incorrectList = new ArrayList<String>();
         List<QuestionHistory> historyOfQuestions = QuestionHistorySummary.findAllHistoriesWithResponses(questionHistoryCollection);
-
         for (QuestionHistory questionHist : historyOfQuestions){
-            String correctAnswer = domainData.getQuestion(questionHist.getQuestionId()).getCorrectAnswer();
-            if (!questionHist.responses.iterator().next().getResponseText().equals(correctAnswer)){
+            boolean hasCorrectAnswer = false;
+
+            for(Response questionResponse : questionHist.responses){
+                String correctAnswer = domainData.getQuestion(questionHist.getQuestionId()).getCorrectAnswer();
+                if (questionResponse.getResponseText().equals(correctAnswer) ){
+                    hasCorrectAnswer = true;
+                }
+            }
+            if (!hasCorrectAnswer){
                 incorrectList.add(questionHist.getQuestionId());
             }
         }
+
         return incorrectList;
     }
 
 
-    public static List<String> findQuestionsCorrectAfterIncorrect(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
+    public static List<String> findQuestionIdsCorrectAfterIncorrect(Collection<QuestionHistory> questionHistoryCollection, DomainDatasource domainData){
         List<String> correctAfterIncorrect = new ArrayList<String>();
         List<QuestionHistory> historyOfQuestions = QuestionHistorySummary.findAllHistoriesWithResponses(questionHistoryCollection);
 
         for (QuestionHistory questionHist : historyOfQuestions){
             for(Response questionResponse : questionHist.responses){
                 String correctAnswer = domainData.getQuestion(questionHist.getQuestionId()).getCorrectAnswer();
-                if (questionResponse.getResponseText().equals(correctAnswer)){
+                if (questionResponse.getResponseText().equals(correctAnswer) && !questionHist.responses.get(0).getResponseText().equals(correctAnswer)){
                     correctAfterIncorrect.add(questionHist.getQuestionId()); 
                 }
             }
@@ -110,19 +117,19 @@ public List<String> getQuestionIdsSeen() {
         return questionIdsSeen;
     }
 
-    public List<String> getQuestionsRespondedTo() {
-        return questionsRespondedTo;
+    public List<String> getQuestionIdsRespondedTo() {
+        return questionIdsRespondedTo;
     }
 
-    public List<String> getQuestionsCorrect() {
-        return questionsCorrect;
+    public List<String> getQuestionIdsCorrectFirstTime() {
+        return questionIdsCorrectFirstTime;
     }
 
-    public List<String> getQuestionsIncorrect(){
-        return questionsIncorrect;
+    public List<String> getQuestionIdsIncorrect(){
+        return questionIdsIncorrect;
     }
 
-    public List<String> getQuestionsCorrectAfterIncorrect(){
-        return questionsCorrectAfterIncorrect;
+    public List<String> getQuestionIdsCorrectAfterIncorrect(){
+        return questionIdsCorrectAfterIncorrect;
     }
 }

src/main/java/edu/ithaca/dragon/par/comm/CreateStudentAction.java

@@ -3,4 +3,10 @@
 public class CreateStudentAction {
     public String studentId;
     public String cohortId;
+
+    public CreateStudentAction(){}
+    public CreateStudentAction(String studentId, String cohortId){
+        this.studentId = studentId;
+        this.cohortId = cohortId;
+    }
 }

src/main/java/edu/ithaca/dragon/par/domain/DomainDatasource.java

@@ -1,6 +1,7 @@
 package edu.ithaca.dragon.par.domain;
 
 import java.util.List;
+import java.util.Set;
 
 public interface DomainDatasource {
 
@@ -11,4 +12,9 @@ public interface DomainDatasource {
      */
     Question getQuestion(String id);
 
+    List<String> retrieveAllConcepts();
+
+    String retrieveConceptForAQuestion(String id);
+
+    List<Question> retrieveQuestionsByConcept(String concept);
 }

src/main/java/edu/ithaca/dragon/par/domain/DomainDatasourceJson.java

@@ -6,7 +6,11 @@
 
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
+
 
 public class DomainDatasourceJson implements  DomainDatasource{
     private final String id;
@@ -42,4 +46,42 @@ public Question getQuestion(String id){
         }
         throw new IllegalArgumentException("No question found, bad ID:" + id);
     }
+
+    @Override
+    public List<String> retrieveAllConcepts() {
+        List<String> concepts = new ArrayList<>();
+
+        for(Question question:questions){
+            if(!concepts.contains(question.getType())){
+                concepts.add(question.getType());
+            }
+        }
+        return concepts;
+    }
+
+    @Override
+    public String retrieveConceptForAQuestion(String id) {
+        for (Question question: questions){
+            if (question.getId().equalsIgnoreCase(id)){
+                return question.getType();
+            }
+        }
+        throw new IllegalArgumentException("No question found, bad ID:" + id);
+    }
+
+    @Override
+    public List<Question> retrieveQuestionsByConcept(String concept) {
+        List<Question> questionList = new ArrayList<>();
+        for (Question question: questions){
+            if (question.getType().equalsIgnoreCase(concept)){
+                questionList.add(question);
+            }
+        }
+        if(questionList.size()==0){
+            throw new IllegalArgumentException("No questions found, bad concept: "+concept);
+        }
+        else{
+            return questionList;
+        }
+    }
 }