GRBK-1244

server/src/java/org/sakaiproject/gradebook/gwt/sakai/Gradebook2ComponentServiceImpl.java

 package org.sakaiproject.gradebook.gwt.sakai;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ skipping 277 matching lines @@
         private UserDirectoryService userService;
 ········
         /*
          * GRBK-824 : Adding class member that is only set during init via sakai properties.
          * Thus, there are no thread safety concerns.
          */
         private boolean checkFinalGradeSubmition = false;
 ········
         protected boolean isShowWeightedEnabled = false;
 ········
+        /*
+         * GRBK-1244: Check if we cache the statistics chart data and notify the client·
+         * accordingly.
+         */
+        private boolean isStatisticsDataChached = false;
+        private int statisticsDataCacheAge = AppConstants.CURRENT_STATISTICS_DATA;
+········
 
         public Learner assignComment(String itemId, String studentUid, String text) {
 
                 Long assignmentId = Long.valueOf(Util.unpackItemIdFromKey(itemId));
                 Comment comment = doAssignComment(assignmentId, studentUid, text);
                 Gradebook gradebook = null;
 
                 if (comment != null)
                         gradebook = doCommitComment(comment, studentUid, text);
                 else {
@@ skipping 500 matching lines @@
         public ApplicationSetup getApplicationSetup(String... gradebookUids)·
         throws GradebookCreationException {
 
                 ApplicationSetup setup = new ApplicationSetupImpl();
                 setup.setGradebookModels(getGradebookModels(gradebookUids));
                 setup.setHelpUrl(helpUrl);
                 setup.setSearchRosterByFieldEnabled(searchRosterByFieldEnabled.booleanValue());
                 setup.setEnabledGradeTypes(enabledGradeTypes);
                 setup.setShowWeightedEnabled(this.isShowWeightedEnabled());
                 setup.setCheckFinalGradeSubmissionStatus(checkFinalGradeSubmition);
+                setup.setCachedDataAge(statisticsDataCacheAge);
 ················
                 return setup;
         }
 
         public String getAuthorizationDetails(String... gradebookUids) {
                 StringBuilder rv = new StringBuilder();
                 for (AuthModel m : getAuthorization(gradebookUids)) {
                         if (rv.length()!=0) {
                                 rv.append(AuthModel.AUTHMODEL_STRING_DELIMITER);
                         }
@@ skipping 1707 matching lines @@
                                 else if (limitScaledExtraCredit.contains("CATEGORIES"))
                                         limitScaledExtraCreditToCategoryType = CategoryType.SIMPLE_CATEGORIES;
                         }
 
                         String enableShowWeighted = configService.getString(AppConstants.ENABLE_SHOW_WEIGHTED_TOGGLE);
                         this.setShowWeightedEnabled(enableShowWeighted != null && Boolean.TRUE.toString().equalsIgnoreCase(enableShowWeighted.trim()));
 ························
                         // GRBK-824
                         checkFinalGradeSubmition = configService.getBoolean(AppConstants.ENABLE_FINAL_GRADE_SUBMISSION_CHECK, false);
 ························
-                } else {
+                        // GRBK-1244
+                        isStatisticsDataChached = configService.getBoolean(AppConstants.ENABLE_STATISTICS_CACHE, false);
+                 ·······
+                        if(isStatisticsDataChached) {
+                         ·······
+                                statisticsDataCacheAge = configService.getInt(AppConstants.STATISTICS_CACHE_TIME_TO_LIVE_SECONDS, AppConstants.STATISTICS_CACHE_TIME_TO_LIVE_SECONDS_DEFAULT);
+                        }
+                        else {
+                         ·······
+                                statisticsDataCacheAge = AppConstants.CURRENT_STATISTICS_DATA;
+                        }
+                }
+                else {
                         enabledGradeTypes.add(GradeType.POINTS);
                         enabledGradeTypes.add(GradeType.PERCENTAGES);
                         enabledGradeTypes.add(GradeType.LETTERS);
                 }
 
                 if (learnerRoleNames == null)
                         learnerRoleNames = advisor.getLearnerRoleNames();
 
                 if (learnerRoleNames == null)
                         learnerRoleNames = new String[] { "Student", "access" };
@@ skipping 4345 matching lines @@
                         else {
 ································
                                 log.warn(i18n.getString("finalGradeSubmissionStatusWarning"));
                         }
                 }
 
                 return (null != status ? status : new FinalGradeSubmissionStatusImpl());
         }
 
 }