Converted get time tracking data to use a range

abhihari010 · awhicks · commit bd83c7519a55 · 2026-01-23T18:07:14.000-05:00
query instead of fetching all data by day
since last fetch date. Also, fixed a bug with
exporting exercise date to CSV.
diff --git a/app/assets/javascripts/odsa_tools.js b/app/assets/javascripts/odsa_tools.js
@@ -304,10 +304,11 @@ $(function () {
 
           if (!_keys.length) {
             resolve({ data: null, date: null });
+            return;
           }
           // sort in descending order
           _keys.sort(function (a, b) {
-            return a - b;
+            return b - a;
           });
 
           // get the most recent record
@@ -390,60 +391,99 @@ $(function () {
     return promise;
   }
 
-  // Gets visualizations data form the local storage if found. Otherwise get it from the server
   function getTimeTrackingData(odsaStore, lookups, count) {
-    var currentDate = getTimestamp(new Date(), "yyyymmdd");
-    var trackingEndDate = lookups["trackingEndDate"];
+    const currentDate = getTimestamp(new Date(), "yyyymmdd");
+    const trackingEndDate = lookups["trackingEndDate"]; // 'yyyymmdd'
 
-    var promise = new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       getStoreData(odsaStore, "odsaTimeTrackingData")
         .then((result) => {
-          if (
-            result &&
-            Object.keys(result).includes("date") &&
-            result["date"] == currentDate
-          ) {
-            resolve(result["data"]);
-          } else {
-            // else recursively fetch all the days until today and
-            var date = result["date"]
-              ? addDay(result["date"])
-              : lookups["term"]["starts_on"].replace(/-/g, "");
+          // Up-to-date cache
+          if (result && result.date === currentDate && result.data) {
+            resolve(result.data);
+            return;
+          }
 
-            // show the overlay
-            $.LoadingOverlay("show", {
-              text: "Downloading OpenDSA Analytics Data",
-              textResizeFactor: 0.3,
-              progress: true,
-            });
+          const hasExistingData = !!(result && result.data);
 
-            var progressEnd = parseInt(trackingEndDate) - parseInt(date);
-            _getTimeTrackingData(
-              odsaStore,
-              "/course_offerings/time_tracking_data/" +
-                ODSA_DATA.course_offering_id +
-                "/date/",
-              date,
-              result["data"],
-              lookups,
-              progressEnd,
-              count
-            )
-              .then((odsaTimeTrackingData) => {
-                resolve(odsaTimeTrackingData);
-              })
-              .catch((err) => {
-                reject(err);
-              });
+          const lastFetchedDate =
+            hasExistingData && result.data && result.data.lastFetchedDate
+              ? result.data.lastFetchedDate
+              : null;
+
+          const fallbackKeyDate = result ? result.date : null;
+
+          const fromDate =
+            hasExistingData && (lastFetchedDate || fallbackKeyDate)
+              ? addDay(lastFetchedDate || fallbackKeyDate)
+              : lookups["term"]["starts_on"].replace(/-/g, "");
+
+          // Nothing to fetch (already caught up)
+          if (parseInt(fromDate, 10) > parseInt(trackingEndDate, 10)) {
+            resolve(result.data);
+            return;
           }
+
+          _getTimeTrackingDataRange(
+            odsaStore,
+            `/course_offerings/time_tracking_data/${ODSA_DATA.course_offering_id}/range`,
+            fromDate,
+            trackingEndDate,
+            hasExistingData ? result.data : null,
+            lookups,
+            count
+          )
+            .then((combined) => resolve(combined))
+            .catch(reject);
         })
-        .catch((err) => {
-          reject(err);
-        });
+        .catch(reject);
     });
-    return promise;
   }
 
+  const _getTimeTrackingDataRange = async function (
+    odsaStore,
+    urlBase,
+    fromDate,
+    toDate,
+    existingStoreData,
+    lookups,
+    count
+  ) {
+    const backoff = 1000 * count;
+
+    $.LoadingOverlay("show", {
+      text: "Downloading OpenDSA Analytics Data",
+      textResizeFactor: 0.3,
+      progress: true,
+    });
+
+    try {
+      const res = await fetch(`${urlBase}?from=${fromDate}&to=${toDate}`).then(
+        sleeper(backoff)
+      );
+
+      if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`Range fetch failed (${res.status}): ${text}`);
+      }
+
+      const rows = await res.json(); // array of {usr_id, mod_id, ch_id, tt, dt, st}
+
+      // Merge new rows into existing aggregated object
+      let combined = formatTimeTrackingData(existingStoreData, rows, lookups);
+      combined = enrichStoreData(combined);
+
+      combined.lastFetchedDate = toDate;
+      await updateStoreData(odsaStore, "odsaTimeTrackingData", combined);
+
+      $.LoadingOverlay("hide");
+      return combined;
+    } catch (err) {
+      $.LoadingOverlay("hide");
+      throw err;
+    }
+  };
+
   // Adds one day to the given date and returns a new date
   function addDay(date) {
     //TODO: refactor
@@ -463,54 +503,6 @@ $(function () {
     };
   }
 
-  // Gets time tracking data form the server for one day
-  const _getTimeTrackingDataPerDay = async function (url, date, backoff) {
-    var data = await fetch(url + date)
-      .then(sleeper(backoff))
-      .then((res) => res.json());
-    return data;
-  };
-
-  // Gets time tracking data recursively form the server
-  const _getTimeTrackingData = async function (
-    odsaStore,
-    url,
-    date,
-    storeData,
-    lookups,
-    progressEnd,
-    count
-  ) {
-    var backoff = 1000 * count;
-    var storeData = storeData || null;
-    var trackingEndDate = lookups["trackingEndDate"];
-    var progress =
-      100 - ((parseInt(trackingEndDate) - parseInt(date)) * 100) / progressEnd;
-    var progressPercent = progress.toFixed(2);
-
-    if (parseInt(date) <= parseInt(trackingEndDate)) {
-      var text = `${progressPercent}% Downloading OpenDSA Analytics Data.`;
-      $.LoadingOverlay("progress", progress);
-      $.LoadingOverlay("text", text);
-      var data = await _getTimeTrackingDataPerDay(url, date, backoff);
-      storeData = formatTimeTrackingData(storeData, data, lookups);
-      return await _getTimeTrackingData(
-        odsaStore,
-        url,
-        addDay(date),
-        storeData,
-        lookups,
-        progressEnd,
-        count
-      );
-    } else {
-      storeData = enrichStoreData(storeData);
-      updateStoreData(odsaStore, "odsaTimeTrackingData", storeData);
-      $.LoadingOverlay("hide");
-      return storeData;
-    }
-  };
-
   // Calculates q1, median, and q3 for array of numbers
   function stats(arr) {
     var sortedArr = [...arr].sort(Plotly.d3.ascending);
@@ -3010,18 +3002,24 @@ $(function () {
       a.remove();
     }
 
-    // ONE click handler (matches HAML id)
-    $(document)
-      .off("click", "#btn-exercise-overview-csv")
-      .on("click", "#btn-exercise-overview-csv", async function (e) {
+    $("#btn-exercise-overview-csv")
+      .off("click.exportcsv")
+      .on("click.exportcsv", async function (e) {
         e.preventDefault();
+
         if ($(this).prop("disabled")) return;
-        var sectionId = getSelectedExerciseSectionId();
+
+        const sectionId = getSelectedExerciseSectionId();
         if (!sectionId) {
           alert("Pick an exercise first.");
           return;
         }
-        await exportExerciseCSV(sectionId);
+
+        try {
+          await exportExerciseCSV(sectionId);
+        } catch (err) {
+          console.error("EXPORT failed:", err);
+        }
       });
 
     function handleModuleDisplay(mod_id) {
diff --git a/app/controllers/course_offerings_controller.rb b/app/controllers/course_offerings_controller.rb
@@ -279,7 +279,7 @@ def get_time_tracking_lookup
     }
   end
 
-  # GET /course_offerings/time_tracking_data/:id
+  # GET /course_offerings/time_tracking_data/:id/date/:date
   def get_time_tracking_data
     if current_user.blank?
       render :json => {
@@ -303,6 +303,48 @@ def get_time_tracking_data
     render :json => userTimeTrackings.as_json()
   end
 
+  # GET /course_offerings/time_tracking_data/:id/range?from=yyyymmdd&to=yyyymmdd
+  def get_time_tracking_data_range
+    if current_user.blank?
+      render json: {
+        message: 'You are not logged in. Please make sure your browser is set to allow third-party cookies',
+      }, status: :forbidden
+      return
+    end
+
+    course_offering = CourseOffering.find(params[:id])
+    unless course_offering.is_instructor?(current_user) || current_user.global_role.is_admin?
+      render json: {
+        message: "You are not an instructor for this course offering. Your user id: #{current_user.id}",
+      }, status: :forbidden
+      return
+    end
+
+    instBook = course_offering.odsa_books.first
+
+    from = params[:from] # 'yyyymmdd'
+    to   = params[:to]   # 'yyyymmdd'
+
+    if from.blank? || to.blank?
+      render json: { message: "Missing 'from' or 'to' query params" }, status: :bad_request
+      return
+    end
+
+    userTimeTrackings = OdsaUserTimeTracking.where(
+      inst_book_id: instBook.id,
+      session_date: from..to
+    ).select(
+      'user_id as usr_id,
+      inst_module_id as mod_id,
+      inst_chapter_id as ch_id,
+      total_time as tt,
+      session_date as dt,
+      sections_time as st'
+    )
+
+    render json: userTimeTrackings.as_json
+  end
+
   # -------------------------------------------------------------
   # GET /course_offerings/new
   def new
diff --git a/config/routes.rb b/config/routes.rb
@@ -110,6 +110,7 @@
   post '/course_offerings' => 'course_offerings#create', as: :create_course_offerings
   get '/course_offerings/:id' => 'course_offerings#show', as: :show_course_offerings
   get '/course_offerings/time_tracking_lookup/:id' => 'course_offerings#get_time_tracking_lookup', as: :get_time_tracking_lookup
+  get '/course_offerings/time_tracking_data/:id/range' => 'course_offerings#get_time_tracking_data_range', as: :get_time_tracking_data_range
   get '/course_offerings/time_tracking_data/:id/date/:date' => 'course_offerings#get_time_tracking_data', as: :get_time_tracking_data
   get '/course_offerings/(:user_id)/:inst_section_id/section' => 'course_offerings#find_attempts', as: :find_attempts
   get '/course_offerings/:id/modules/:inst_chapter_module_id/progresses' => 'course_offerings#find_module_progresses', as: :find_module_progresses
