Merge remote-tracking branch 'origin/PeerAssessmentChristian_2' into...
Merge remote-tracking branch 'origin/PeerAssessmentChristian_2' into development_master_refactoring_1 # Conflicts: # gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java 2 additions, 0 deletions...chen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java 96 additions, 5 deletions...am/gf/modules/assessment/controller/model/Assessment.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/GroupEvalDataDatasets.java 73 additions, 0 deletions...es/assessment/controller/model/GroupEvalDataDatasets.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/GroupEvalDataList.java 41 additions, 0 deletions...odules/assessment/controller/model/GroupEvalDataList.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/GroupEvalDiagrammData.java 123 additions, 0 deletions...es/assessment/controller/model/GroupEvalDiagrammData.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/GroupEvalDiagrammLegende.java 14 additions, 0 deletions...assessment/controller/model/GroupEvalDiagrammLegende.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/GroupEvalOption.java 16 additions, 0 deletions.../modules/assessment/controller/model/GroupEvalOption.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/PACalculate.java 40 additions, 0 deletions...m/gf/modules/assessment/controller/model/PACalculate.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java 1 addition, 2 deletions...es/assessment/controller/service/PeerAssessmentDummy.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java 126 additions, 0 deletions...gf/modules/assessment/controller/view/AssessmentView.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java 1 addition, 0 deletions...tsdam/gf/modules/assessment/controller/view/QuizView.java
- gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js 401 additions, 0 deletions...schen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
- gemeinsamforschen/src/main/webapp/assets/js/grading.js 8 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/js/grading.js
- gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js 4 additions, 2 deletions...nsamforschen/src/main/webapp/assets/js/overview-docent.js
- gemeinsamforschen/src/main/webapp/assets/js/utility.js 1 addition, 0 deletionsgemeinsamforschen/src/main/webapp/assets/js/utility.js
- gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp 166 additions, 0 deletions...insamforschen/src/main/webapp/pages/project-docent_CG.jsp
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java 60 additions, 2 deletions...a/unipotsdam/gf/modules/assessment/TestAddAssessment.java
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java.orig 156 additions, 0 deletions...potsdam/gf/modules/assessment/TestAddAssessment.java.orig
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/view/CommunicationViewTest.java 0 additions, 128 deletions.../gf/modules/communication/view/CommunicationViewTest.java
Loading
Please register or sign in to comment