Merge pull request #360 from Aspine/recent-activity

Recent activity
Aspine · May 16, 2023 · c68cb94 · c68cb94
2 parents 6ffadd7 + bbd022d
commit c68cb94
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 82 deletions.
diff --git a/public/css/home.css b/public/css/home.css
@@ -1,4 +1,4 @@
-/*//////////////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////////////////
 [ FONT ]*/
 
 @font-face {
@@ -305,8 +305,11 @@ button:hover {
   background-color: var(--white3);
 }
 
-
+/* sets attendance as default instead of activity */
 #recentAttendance {
+  display: block;
+}
+#recentActivity {
   display: none;
 }
 
@@ -495,7 +498,7 @@ button:hover {
   to {opacity: 1;}
 }
 #recent_title {
-  color: var(--white);
+  color: white;
   display: inline;
   position: relative;
   font-size: 20px;
@@ -638,6 +641,12 @@ i.fa.fa-toolbox {
   cursor: pointer;
 }
 
+#mostRecentTable .tabulator-tableHolder {
+  height: 100% !important;
+  max-height: 100% !important;
+  min-height: 100% !important;
+}
+
 #gradesButtons{
   height:35px;
   display:flex;
@@ -650,6 +659,12 @@ i.fa.fa-toolbox {
   height:35px;
 }
 
+#mostRecentTable .tabulator-tableHolder {
+  height: 100% !important;
+  max-height: 100% !important;
+  min-height: 100% !important;
+}
+
 #classesTable .tabulator-col,
 #classesTable .tabulator-header,
 #assignmentsTable .tabulator-col,

diff --git a/public/home.html b/public/home.html
@@ -90,7 +90,7 @@ <h4 id="title" onclick="openTab('grades')">Aspine</h4>
     <button class="tablinks hide switch-exempt" onclick="openSideNav()" id="hamburger_button"><i class="fa fa-bars"></i></button>
     <button class="tablinks active" onclick="openTab('grades'); closeSideNav()" id="grades_open">Grades</button>
     <button class="tablinks" onclick="openTab('schedule'); closeSideNav()" id="schedule_open">Schedule</button>
-    <button class="tablinks" onclick="openTab('recent'); closeSideNav()" id="recent_open">Attendance</button>
+    <button class="tablinks" onclick="openTab('recent'); closeSideNav()" id="recent_open">Attendance & Recent</button>
     <!--<button class="tablinks" onclick="openTab(event, 'clock')">Clock</button>-->
     <!-- TODO: post-covid, setting lunch should be migrated to settings -->
     <!--<button class="tablinks" onclick="openTab(event, 'calendar-tab')">Calendar</button>-->
@@ -204,6 +204,8 @@ <h3 id="import_modal_title">Import Data</h3>
     </div>
   </div>
 
+
+
   <div id="grades" class="tabcontent">
 
     <div id="gradesButtons">
@@ -220,8 +222,8 @@ <h3 id="import_modal_title">Import Data</h3>
     <div id="classesTable"></div>
     <div id="mostRecentDiv" style="display:none">
       <!-- hide most recent activity; removed from aspen -->
-      <!-- <h3 align="left">Most Recent Activity:</h3> -->
-      <div id="mostRecentTable" style="display: none;"></div>
+      <h3 align="left">Most Recent Activity:</h3>
+      <div id="mostRecentTable"></div>
     </div>
     <div id="categoriesTable"></div>
 
@@ -310,6 +312,7 @@ <h3 id="stats_modal_title">Modal Title..</h3>
 
     <div id="assignmentsTable"></div>
   </div>
+
   <div id="schedule" class="tabcontent">
     <!-- Rounded switch -->
     <!-- Black/silver switch disabled due to covid-19 schedule -->
@@ -342,14 +345,13 @@ <h3 id="stats_modal_title">Modal Title..</h3>
     <p id="large_clock_period"></p>
   </div>
   <div id="recent" class="tabcontent">
-    <!-- <label class="switch">
+    <label class="switch">
       <input type="checkbox" id="recent_toggle" onclick="recent_toggle();">
       <span class="slider round"></span>
-      <p id="recent_title" class="unselectable">Assignments</p>
-    </label>-->
-    <div id="recentActivity" style="display: none"></div>
-    <div id="recentAttendance" style="display: block"></div>
-    <!-- recentActivity is hidden because Aspen does not display recent assignments -->
+      <p id="recent_title" class="unselectable">Attendance</p>
+   </label>
+    <div id="recentActivity"></div>
+    <div id="recentAttendance"></div>
   </div>
   <div id="reports" class="tabcontent">
     <div class="pdf_topnav">

diff --git a/public/js/extraFunctions.js b/public/js/extraFunctions.js
@@ -41,23 +41,6 @@ let classIndex = function(classname) {
   // why the mod 8?
 }
 
-let classFormatter = function(cell, formatterParams) {
-  let rowClass = cell.getRow().getData().classname;
-  let classColor = classColors[classIndex(rowClass)];
-  let value = cell.getValue();
-
-  if (vip_username_list.includes(currentTableData.username)) {
-    return "<span style='background: -webkit-linear-gradient(left, red, orange, green, blue, purple);-webkit-background-clip: text; -webkit-text-fill-color:transparent; font-weight:bold;'>" + value + "</span>";
-
-  }
-
-  if (classColor === "black") {
-    return value;
-  } else {
-    return "<span style='color:" + classColor + "; font-weight:bold;'>" + value + "</span>";
-  }
-}
-
 let weightFormatter = function(cell, formatterParams) {
   let value = cell.getValue();
   let rowColor = cell.getRow().getData().color;