@@ -106,7 +106,7 @@ public class GradebookPage extends BasePage {
106106 GbModalWindow courseGradeStatisticsWindow ;
107107
108108 Label liveGradingFeedback ;
109- boolean hasAssignmentsAndGrades ;
109+ boolean hasGradebookItems , hasStudents ;
110110 private static final AttributeModifier DISPLAY_NONE = new AttributeModifier ("style" , "display: none" );
111111
112112 Form <Void > form ;
@@ -115,6 +115,8 @@ public class GradebookPage extends BasePage {
115115 boolean showGroupFilter = true ;
116116 private GbGradeTable gradeTable ;
117117
118+ private final WebMarkupContainer tableArea ;
119+
118120 @ SuppressWarnings ({ "rawtypes" , "unchecked" , "serial" })
119121 public GradebookPage () {
120122 disableLink (this .gradebookPageLink );
@@ -195,25 +197,6 @@ public GradebookPage() {
195197 this .courseGradeStatisticsWindow .setPositionAtTop (true );
196198 this .form .add (this .courseGradeStatisticsWindow );
197199
198- final GbAjaxButton addGradeItem = new GbAjaxButton ("addGradeItem" ) {
199- @ Override
200- public void onSubmit (final AjaxRequestTarget target , final Form form ) {
201- final GbModalWindow window = getAddOrEditGradeItemWindow ();
202- window .setTitle (getString ("heading.addgradeitem" ));
203- window .setComponentToReturnFocusTo (this );
204- window .setContent (new AddOrEditGradeItemPanel (window .getContentId (), window , null ));
205- window .show (target );
206- }
207-
208- @ Override
209- public boolean isVisible () {
210- return (businessService .isUserAbleToEditAssessments ());
211- }
212- };
213- addGradeItem .setDefaultFormProcessing (false );
214- addGradeItem .setOutputMarkupId (true );
215- this .form .add (addGradeItem );
216-
217200 // first get any settings data from the session
218201 final GradebookUiSettings settings = getUiSettings ();
219202
@@ -227,28 +210,52 @@ public boolean isVisible() {
227210 final List <Assignment > assignments = this .businessService .getGradebookAssignments (sortBy );
228211 final List <String > students = this .businessService .getGradeableUsers ();
229212
230- this . hasAssignmentsAndGrades = !assignments . isEmpty () && ! students .isEmpty ();
231-
213+ hasGradebookItems = !assignments .isEmpty ();
214+ hasStudents = ! students . isEmpty ();
232215 // categories enabled?
233216 final boolean categoriesEnabled = this .businessService .categoriesAreEnabled ();
234217
235218 // grading type?
236219 final GradingType gradingType = GradingType .valueOf (gradebook .getGrade_type ());
237220
221+ tableArea = new WebMarkupContainer ("gradeTableArea" );
222+ if (!hasGradebookItems ) {
223+ tableArea .add (AttributeAppender .append ("class" , "gradeTableArea" ));
224+ }
225+ form .add (tableArea );
226+
227+ final GbAddButton addGradeItem = new GbAddButton ("addGradeItem" );
228+ addGradeItem .setDefaultFormProcessing (false );
229+ addGradeItem .setOutputMarkupId (true );
230+ tableArea .add (addGradeItem );
231+
238232 final WebMarkupContainer noAssignments = new WebMarkupContainer ("noAssignments" );
239233 noAssignments .setVisible (assignments .isEmpty ());
240- this .form .add (noAssignments );
234+ tableArea .add (noAssignments );
235+ final GbAddButton addGradeItem2 = new GbAddButton ("addGradeItem2" ) {
236+ @ Override
237+ public boolean isVisible () {
238+ return GradebookPage .this .role == GbRole .INSTRUCTOR ;
239+ }
240+ };
241+ addGradeItem2 .setDefaultFormProcessing (false );
242+ addGradeItem2 .setOutputMarkupId (true );
243+ noAssignments .add (addGradeItem2 );
241244
242245 final WebMarkupContainer noStudents = new WebMarkupContainer ("noStudents" );
243246 noStudents .setVisible (students .isEmpty ());
244- this . form .add (noStudents );
247+ tableArea .add (noStudents );
245248
246249 // Populate the toolbar
247250 final WebMarkupContainer toolbar = new WebMarkupContainer ("toolbar" );
248- this .form .add (toolbar );
251+ tableArea .add (toolbar );
252+
253+ final WebMarkupContainer toolbarColumnTools = new WebMarkupContainer ("gbToolbarColumnTools" );
254+ toolbarColumnTools .setVisible (hasGradebookItems );
255+ toolbar .add (toolbarColumnTools );
249256
250257 final WebMarkupContainer toggleGradeItemsToolbarItem = new WebMarkupContainer ("toggleGradeItemsToolbarItem" );
251- toolbar .add (toggleGradeItemsToolbarItem );
258+ toolbarColumnTools .add (toggleGradeItemsToolbarItem );
252259
253260 this .gradeTable = new GbGradeTable ("gradeTable" ,
254261 new LoadableDetachableModel () {
@@ -276,7 +283,7 @@ public GbGradeTableData load() {
276283 this .gradeTable .addEventListener ("viewCourseGradeStatistics" , new ViewCourseGradeStatisticsAction ());
277284
278285
279- this . form .add (this .gradeTable );
286+ tableArea .add (this .gradeTable );
280287
281288 final Button toggleCategoriesToolbarItem = new Button ("toggleCategoriesToolbarItem" ) {
282289 @ Override
@@ -302,7 +309,7 @@ public boolean isVisible() {
302309 return categoriesEnabled ;
303310 }
304311 };
305- toolbar .add (toggleCategoriesToolbarItem );
312+ toolbarColumnTools .add (toggleCategoriesToolbarItem );
306313
307314 final GbAjaxLink sortGradeItemsToolbarItem = new GbAjaxLink ("sortGradeItemsToolbarItem" ) {
308315 @ Override
@@ -324,7 +331,7 @@ public boolean isVisible() {
324331 return (businessService .isUserAbleToEditAssessments ());
325332 }
326333 };
327- toolbar .add (sortGradeItemsToolbarItem );
334+ toolbarColumnTools .add (sortGradeItemsToolbarItem );
328335
329336 // section and group dropdown
330337 final List <GbGroup > groups = this .businessService .getSiteSectionsAndGroups ();
@@ -405,15 +412,13 @@ protected void onUpdate(final AjaxRequestTarget target) {
405412 groupFilter .setNullValid (false );
406413
407414 // if only one item, hide the dropdown
408- if (groups .size () == 1 || !this .hasAssignmentsAndGrades ) {
409- groupFilter .setVisible (false );
410- }
415+ groupFilter .setVisible (groups .size () > 1 && hasStudents );
411416
412417 final WebMarkupContainer studentFilter = new WebMarkupContainer ("studentFilter" );
413- studentFilter .setVisible (this . hasAssignmentsAndGrades );
418+ studentFilter .setVisible (hasStudents );
414419 toolbar .add (studentFilter );
415420
416- this . form .add (groupFilter );
421+ tableArea .add (groupFilter );
417422
418423 final Map <String , Object > togglePanelModel = new HashMap <>();
419424 togglePanelModel .put ("assignments" , this .businessService .getGradebookAssignments (sortBy ));
@@ -424,17 +429,9 @@ protected void onUpdate(final AjaxRequestTarget target) {
424429 new ToggleGradeItemsToolbarPanel ("gradeItemsTogglePanel" , Model .ofMap (togglePanelModel ));
425430 add (gradeItemsTogglePanel );
426431
427- this .form .add (new WebMarkupContainer ("captionToggle" ).setVisible (this .hasAssignmentsAndGrades ));
428-
429- //
430- // hide/show components
431- //
432+ tableArea .add (new WebMarkupContainer ("captionToggle" ).setVisible (hasStudents ));
432433
433- // Only show the toolbar if there are students and grade items
434- toolbar .setVisible (!assignments .isEmpty ());
435-
436- // Show the table if there are grade items
437- this .gradeTable .setVisible (!assignments .isEmpty ());
434+ toolbar .setVisible (hasStudents || hasGradebookItems );
438435
439436 stopwatch .time ("Gradebook page done" , stopwatch .getTime ());
440437 }
@@ -560,15 +557,15 @@ public void onBeforeRender() {
560557 // add simple feedback nofication to sit above the table
561558 // which is reset every time the page renders
562559 this .liveGradingFeedback = new Label ("liveGradingFeedback" , getString ("feedback.saved" ));
563- this .liveGradingFeedback .setVisible (this . hasAssignmentsAndGrades );
560+ this .liveGradingFeedback .setVisible (hasGradebookItems && hasStudents );
564561 this .liveGradingFeedback .setOutputMarkupId (true );
565562 this .liveGradingFeedback .add (DISPLAY_NONE );
566563
567564 // add the 'saving...' message to the DOM as the JavaScript will
568565 // need to be the one that displays this message (Wicket will handle
569566 // the 'saved' and 'error' messages when a grade is changed
570567 this .liveGradingFeedback .add (new AttributeModifier ("data-saving-message" , getString ("feedback.saving" )));
571- this . form .addOrReplace (this .liveGradingFeedback );
568+ tableArea .addOrReplace (this .liveGradingFeedback );
572569 }
573570
574571 public Component updateLiveGradingMessage (final String message ) {
@@ -578,4 +575,29 @@ public Component updateLiveGradingMessage(final String message) {
578575 }
579576 return this .liveGradingFeedback ;
580577 }
578+
579+ private class GbAddButton extends GbAjaxButton {
580+
581+ public GbAddButton (String id ) {
582+ super (id );
583+ }
584+
585+ public GbAddButton (String id , Form <?> form ) {
586+ super (id , form );
587+ }
588+
589+ @ Override
590+ public void onSubmit (final AjaxRequestTarget target , final Form form ) {
591+ final GbModalWindow window = getAddOrEditGradeItemWindow ();
592+ window .setTitle (getString ("heading.addgradeitem" ));
593+ window .setComponentToReturnFocusTo (this );
594+ window .setContent (new AddOrEditGradeItemPanel (window .getContentId (), window , null ));
595+ window .show (target );
596+ }
597+
598+ @ Override
599+ public boolean isVisible () {
600+ return GradebookPage .this .role == GbRole .INSTRUCTOR && hasGradebookItems ;
601+ }
602+ }
581603}
0 commit comments