Skip to content

Commit

Permalink
SAK-33855 allow students to view assignment/course grade stats (sakai…
Browse files Browse the repository at this point in the history 
…project#6506)

* SAK-33855 add settings control for stats release to students

* SAK-33855 add in the hibernate and DTO parts for storage of the assignment and course grade stats settings.
Updated front end panel to use the new fields in GradebookInformation
Removed boilerplate cruft from backend classes

* SAK-33855 make new gradebooks get the stats enabled by default, as per upgrade scripts
Refactor logging blocks to add curly braces as they were missing

* SAK-33855 Added stats link in Student view for assignment statistics

WIP, needs permission to access gradebook service before adding content.
Also need to figure out why the icon isn't displaying, using text in the meantime.

* Delete GbBasicModalWindow.java

Not required

* SAK-33855 wrap calls for stats in a security advisor so students can view stats. Add security advisor to gradebook settings calls so a students session could get the info. Conditionally show stats based on the settings. Wire in the assignment chart for students

* Feature/sak-33855 (sakaiproject#11)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* Feature/sak 33855 (sakaiproject#12)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* SAK-33855 Remove stats from student course grade stats window to prevent students from seeing max and min grades for other students, fixed highlighting of icon, turned off the assignment stats icon for instructor view (only in student view)

* SAK-33855 back out this change

* SAK-33855 address accesslint issues

* SAK-33855 a stack of code cleanup on GradebookFrameworkServiceImpl

* SAK-33855 migrated to @DaTa

* SAK-33855 fix codacy issues

* SAK-33855 move inside panel

* SAK-33855 make intent clearer to class members
  • Loading branch information
@steveswinsburg @ern
steveswinsburg authored and ern committed Feb 13, 2019
1 parent 2a2897b commit e3d992a
Show file tree
Hide file tree
Showing 23 changed files with 758 additions and 634 deletions.
124 changes: 13 additions & 111 deletions ...-service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookInformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;

/**
* Represents the settings for the gradebook
*
*/
@Data
public class GradebookInformation implements Serializable {
private static final long serialVersionUID = 1L;

Expand All @@ -48,8 +48,11 @@ public class GradebookInformation implements Serializable {
private Map<String, Double> selectedGradingScaleBottomPercents;

private boolean displayReleasedGradeItemsToStudents;

private int gradeType;

private int categoryType;

private List<CategoryDefinition> categories;

/**
Expand Down Expand Up @@ -77,115 +80,14 @@ public class GradebookInformation implements Serializable {
*/
private boolean courseAverageDisplayed;

public String getSelectedGradingScaleUid() {
return this.selectedGradingScaleUid;
}

public void setSelectedGradingScaleUid(final String selectedGradingScaleUid) {
this.selectedGradingScaleUid = selectedGradingScaleUid;
}

public String getSelectedGradeMappingId() {
return this.selectedGradeMappingId;
}

public void setSelectedGradeMappingId(final String selectedGradeMappingId) {
this.selectedGradeMappingId = selectedGradeMappingId;
}

public List<GradeMappingDefinition> getGradeMappings() {
return this.gradeMappings;
}

public void setGradeMappings(final List<GradeMappingDefinition> gradeMappings) {
this.gradeMappings = gradeMappings;
}

public Map<String, Double> getSelectedGradingScaleBottomPercents() {
return this.selectedGradingScaleBottomPercents;
}

public void setSelectedGradingScaleBottomPercents(
final Map<String, Double> selectedGradingScaleBottomPercents) {
this.selectedGradingScaleBottomPercents = selectedGradingScaleBottomPercents;
}

public boolean isDisplayReleasedGradeItemsToStudents() {
return this.displayReleasedGradeItemsToStudents;
}

public void setDisplayReleasedGradeItemsToStudents(
final boolean displayReleasedGradeItemsToStudents) {
this.displayReleasedGradeItemsToStudents = displayReleasedGradeItemsToStudents;
}

public int getGradeType() {
return this.gradeType;
}

public void setGradeType(final int gradeType) {
this.gradeType = gradeType;
}

public int getCategoryType() {
return this.categoryType;
}

public void setCategoryType(final int categoryType) {
this.categoryType = categoryType;
}

public String getGradeScale() {
return this.gradeScale;
}

public void setGradeScale(final String gradeScale) {
this.gradeScale = gradeScale;
}

public boolean isCourseGradeDisplayed() {
return this.courseGradeDisplayed;
}

public void setCourseGradeDisplayed(final boolean courseGradeDisplayed) {
this.courseGradeDisplayed = courseGradeDisplayed;
}

public List<CategoryDefinition> getCategories() {
return this.categories;
}

public void setCategories(final List<CategoryDefinition> categories) {
this.categories = categories;
}

public boolean isCourseLetterGradeDisplayed() {
return this.courseLetterGradeDisplayed;
}

public void setCourseLetterGradeDisplayed(final boolean courseLetterGradeDisplayed) {
this.courseLetterGradeDisplayed = courseLetterGradeDisplayed;
}

public boolean isCoursePointsDisplayed() {
return this.coursePointsDisplayed;
}

public void setCoursePointsDisplayed(final boolean coursePointsDisplayed) {
this.coursePointsDisplayed = coursePointsDisplayed;
}
/**
* Are assignment stats to be shown to students?
*/
private boolean assignmentStatsDisplayed;

public boolean isCourseAverageDisplayed() {
return this.courseAverageDisplayed;
}

public void setCourseAverageDisplayed(final boolean courseAverageDisplayed) {
this.courseAverageDisplayed = courseAverageDisplayed;
}

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
}
/**
* Are course grade stats to be shown to students?
*/
private boolean courseGradeStatsDisplayed;

}
5 changes: 5 additions & 0 deletions ...adebook-service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/Gradebook.hbm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

<property name="scaledExtraCredit" column="IS_SCALED_EXTRA_CREDIT" type="boolean" not-null="false"/>

<!-- all of the DO_ prefixed fields are gradebook2 fields and not used in the main Gradebook -->
<property name="showMean" column="DO_SHOW_MEAN" type="boolean" not-null="false"/>

<property name="showMedian" column="DO_SHOW_MEDIAN" type="boolean" not-null="false"/>
Expand All @@ -59,5 +60,9 @@

<property name="courseLetterGradeDisplayed" column="COURSE_LETTER_GRADE_DISPLAYED" type="boolean" not-null="true"/>

<property name="assignmentStatsDisplayed" column="ASSIGNMENT_STATS_DISPLAYED" type="boolean" not-null="true"/>

<property name="courseGradeStatsDisplayed" column="COURSE_GRADE_STATS_DISPLAYED" type="boolean" not-null="true"/>

</class>
</hibernate-mapping>
Loading

0 comments on commit e3d992a

Please sign in to comment.