Merge pull request #320 from RIT-Software-Engineering/1-8-1-Release-Cleanup

1 8 1 release cleanup

Author: atparsec

README.md

@@ -35,7 +35,11 @@ _**On first login, new user must change password by using the `passwd` command**
 ## Install/Develop locally
 
 - ### Using Dev Container
-
+  - You *may* need to add the following to your hosts file (`C:\Windows\System32\drivers\etc\hosts`):
+    ```
+    150.171.69.10 mcr.microsoft.com
+    150.171.69.10 eastus.data.mcr.microsoft.com
+    ```
   - Install [Docker](https://docs.docker.com/get-docker/)
   - Install [VSCode](https://code.visualstudio.com/) and the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
   - Open the project in VSCode and select "Reopen in Container" from the command palette (Ctrl+Shift+P)

install.ps1

@@ -11,6 +11,7 @@ cp "$PSScriptRoot/server/server/config/seniorproject-key.pem.sample" "$PSScriptR
 npm install -g prettier
 
 if ($CleanInstall) {
+    git restore . && git clean -fd
     Write-Host "🧹 Cleaning up all installed packages..."
     Write-Host "This can take a while..."
     Remove-Item -Recurse -Force "$PSScriptRoot/server/node_modules" -ErrorAction SilentlyContinue

install.sh

@@ -6,4 +6,4 @@ npm install
 cd server
 npm install
 cd ../ui
-npm installl --legacy-peer-deps
+npm install --legacy-peer-deps

server/db_setup.js

@@ -10,8 +10,8 @@ const DBHandler = require("./server/database/db");
 let db = new DBHandler();
 const Logger = require("./server/logger");
 
-const table_sql_path = "./server/database/table_sql";
-const dummy_data_path = "./server/database/test_data";
+const table_sql_path = path.join(__dirname, "server", "database", "table_sql");
+const dummy_data_path = path.join(__dirname, "server", "database", "test_data");
 
 // Define dummy files that should be preserved during reset
 const PRESERVE_FILES = [

server/main.js

@@ -61,6 +61,9 @@ app.use(
 // Fix for the Content Editor on local development TODO/Important check if there is a better fix and if it breaks in live live
 app.use("/resource", express.static(path.join(__dirname, "resource")));
 
+// Serve static files from doc directory TODO/check if this is needed
+app.use("/doc", express.static(path.join(__dirname, "doc")));
+
 // This is down here because saml_routes needs to be initialized after the express.urlencoded() middleware to be able to process Shibboleth logins
 const routing = require("./server/routing/index");
 // Attach route handlers

server/server/database/test_data/actions_dummy.sql

@@ -958,17 +958,6 @@ VALUES
         "",
         ""
     ),
-    (
-        2,
-        "Labor Day",
-        '',
-        "Labor Day",
-        "break_period",
-        strftime("%Y", DATE("now")) || "-09-01",
-        strftime("%Y", DATE("now")) || "-09-01",
-        "",
-        ""
-    ),
     (
         2,
         "Thanksgiving Break",

server/server/database/test_data/page_html_dummy.sql

@@ -22,7 +22,7 @@ INSERT INTO page_html (name, html) VALUES
                          <div class="row">
                              <p>
                                  Please reference the&nbsp
-                                 <a href="../doc/ProposalInstructions.pdf" target="_blank">
+                                 <a href="__SERVER_BASE_URL__/doc/ProposalInstructions.pdf" target="_blank">
                                      proposal instructions
                                  </a>&nbsp
                                  as you prepare your project proposal.

server/server/database/test_data/project_dummy.sql

@@ -182,7 +182,7 @@ VALUES
     ),
     (
         '6_nextwave',
-        'sumbitted',
+        'submitted',
         'NextWave AR-Based Shopping Assistant for Retail Innovation',
         'WaveTech Innovations',
         'John Smith',

server/server/database/test_data/user_dummy.sql

@@ -29,6 +29,20 @@ VALUES
         '2025-11-30 09:12:34'
         ),
         (
+        'myeyes',
+        'Light',
+        'Mode',
+        'lma@admin.edu',
+        'admin',
+        NULL,
+        NULL,
+        '',
+        0,
+        '{"additional_info":"", "dark_mode":false, "gantt_view":true, "milestone_view":true, "calendar_view":true}',
+        '2025-01-10 14:05:12',
+        '2025-12-20 16:45:00'
+        ),
+        (
         'cave',
         'View Only',
         'Admin',

server/server/routing/db_routes.js

@@ -515,6 +515,38 @@ module.exports = (db) => {
         return next(error);
       }
 
+      // Validate that the work date is not in the future
+      // This prevents users from logging time for dates that haven't occurred yet
+      const workDate = new Date(req.body.date);
+      const currentDate = new Date();
+      const currentDateOnly = new Date(
+        currentDate.getFullYear(),
+        currentDate.getMonth(),
+        currentDate.getDate(),
+      );
+      const workDateOnly = new Date(
+        workDate.getFullYear(),
+        workDate.getMonth(),
+        workDate.getDate(),
+      );
+
+      if (workDateOnly > currentDateOnly) {
+        const error = new Error("Cannot log time for future dates");
+        error.statusCode = 400;
+        return next(error);
+      }
+
+      // Validate that the work date is within the past 14 days (2 weeks)
+      // This maintains the existing business rule about recent time logging
+      const twoWeeksAgo = new Date(currentDateOnly);
+      twoWeeksAgo.setDate(twoWeeksAgo.getDate() - 14);
+
+      if (workDateOnly < twoWeeksAgo) {
+        const error = new Error("Cannot log time for dates older than 14 days");
+        error.statusCode = 400;
+        return next(error);
+      }
+
       let mock_id = req.user.mock ? req.user.mock.system_id : "";
 
       const sql = `INSERT INTO time_log
@@ -2353,7 +2385,7 @@ module.exports = (db) => {
     (req, res, next) => {
       calculateActiveTimelines(req.user)
         .then((timelines) => {
-          res.send(timelines);
+          res.json(timelines);
         })
         .catch((err) => {
           console.error(err);
@@ -2564,6 +2596,29 @@ module.exports = (db) => {
     }
     db.query(getHtmlQuery, queryParams)
       .then((html) => {
+        // Replace placeholder with actual server base URL
+        const serverBaseUrl =
+          process.env.NODE_ENV === "production"
+            ? process.env.PRODUCTION_SERVER_URL ||
+              process.env.BASE_URL ||
+              `${req.protocol}://${req.get("host")}`
+            : `${req.protocol}://${req.get("host")}`;
+
+        // Process HTML to replace placeholders
+        if (Array.isArray(html)) {
+          html = html.map((item) => {
+            if (item.html) {
+              item.html = item.html.replace(
+                /__SERVER_BASE_URL__/g,
+                serverBaseUrl,
+              );
+            }
+            return item;
+          });
+        } else if (html && html.html) {
+          html.html = html.html.replace(/__SERVER_BASE_URL__/g, serverBaseUrl);
+        }
+
         res.send(html);
       })
       .catch((err) => {
@@ -3081,7 +3136,7 @@ module.exports = (db) => {
     (req, res, next) => {
       let getSponsorNotesQuery = `
             SELECT sponsor_notes.*, 
-                   users.fname, users.lname, users.email,
+                   users.fname, users.lname, users.email, users.type,
                    (SELECT users.fname || ' ' || users.lname FROM users WHERE users.system_id = sponsor_notes.mock_id) AS mock_name
             FROM sponsor_notes
             JOIN users
@@ -4213,8 +4268,9 @@ module.exports = (db) => {
           }
 
           let getPeerEvalLogsQuery = `
-          SELECT * 
+          SELECT action_log.*, users.fname, users.lname, users.type
           FROM action_log
+          LEFT JOIN users ON action_log.system_id = users.system_id
           WHERE action_template IN (${actionIds.join(",")})
           ORDER BY submission_datetime DESC
         `;