From 88c9964a55a2e7934dee8131748dbd2789863259 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:28:06 -0700
Subject: [PATCH 01/17] make frontend component

---
 .../frontend/src/views/AdminView/ConfigView.vue       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
index 5252c1d2..5f4db841 100644
--- a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
+++ b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
@@ -48,6 +48,17 @@ onMounted( async () => {
       </template>
     </ConfigSection>
 
+    <ConfigSection title="Penalties" description="Values used for calculating penalties">
+      <template #editor="{ closeEditor }">
+
+      </template>
+      <template #current>
+        <p><span class="infoLabel">Daily Late Penalty: </span> 10%</p>
+        <p><span class="infoLabel">Max Days Penalized: </span> 5</p>
+        <p><span class="infoLabel">Git Commit Penalty: </span> 10%</p>
+      </template>
+    </ConfigSection>
+
     <ConfigSection title="Course IDs" description="Phase assignment ID numbers, rubric IDs, and rubric points">
       <template #editor="{ closeEditor }">
         <CourseIdConfigEditor :closeEditor="closeEditor"/>

From 3c9843d5d7baa0ae9ed362e4698f297ae6dca5b3 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:28:25 -0700
Subject: [PATCH 02/17] add setters and getters for config

---
 .../byu/cs/dataAccess/ConfigurationDao.java   |  5 +++-
 .../edu/byu/cs/service/ConfigService.java     | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java b/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
index b2b338cd..367c7861 100644
--- a/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
+++ b/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
@@ -17,6 +17,9 @@ enum Configuration {
         PHASE4_ASSIGNMENT_NUMBER,
         PHASE5_ASSIGNMENT_NUMBER,
         PHASE6_ASSIGNMENT_NUMBER,
-        COURSE_NUMBER
+        COURSE_NUMBER,
+        MAX_LATE_DAYS_TO_PENALIZE,
+        PER_DAY_LATE_PENALTY,
+        GIT_COMMIT_PENALTY
     }
 }
diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index 876b39c7..52e015cb 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -211,4 +211,34 @@ public static void updateCourseIdsUsingCanvas(User user) throws CanvasException,
                 user.netId()
         );
     }
+
+    public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessException {
+        ConfigurationDao dao = DaoService.getConfigurationDao();
+        dao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
+        logConfigChange("set maximum late days penalized to %s".formatted(maxDays), user.netId());
+    }
+
+    /**
+     *
+     * @param user the user making the change
+     * @param perDayPenalty the penalty per day that should be applied. For example, a 10% penalty per day should be
+     *                      passed in as 0.1
+     */
+    public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws DataAccessException {
+        ConfigurationDao dao = DaoService.getConfigurationDao();
+        dao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
+        logConfigChange("set the per day late penalty to %s".formatted(perDayPenalty), user.netId());
+    }
+
+    /**
+     *
+     * @param user the user making the change
+     * @param gitCommitPenalty the penalty should be applied for not having enough commits. For example, a 10%
+     *                         penalty per day should be passed in as 0.1
+     */
+    public static void setGitCommitPenalty(User user, Float gitCommitPenalty) throws DataAccessException {
+        ConfigurationDao dao = DaoService.getConfigurationDao();
+        dao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
+        logConfigChange("set the git commit penalty to %s".formatted(gitCommitPenalty), user.netId());
+    }
 }

From 69be0350ee4d7be8c0d4febcf1aefb8eabd009fe Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 00:47:16 -0700
Subject: [PATCH 03/17] read penalty values on frontend from backend

---
 .../byu/cs/controller/ConfigController.java   | 16 ++++++++++++++++
 .../dataAccess/sql/ConfigurationSqlDao.java   | 10 +++++++---
 src/main/java/edu/byu/cs/server/Server.java   |  2 ++
 .../edu/byu/cs/service/ConfigService.java     | 10 ++++++++++
 .../frontend/src/stores/appConfig.ts          | 19 ++++++++++++++++++-
 .../src/views/AdminView/ConfigView.vue        |  6 +++---
 6 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/byu/cs/controller/ConfigController.java b/src/main/java/edu/byu/cs/controller/ConfigController.java
index c111a7fc..896285c7 100644
--- a/src/main/java/edu/byu/cs/controller/ConfigController.java
+++ b/src/main/java/edu/byu/cs/controller/ConfigController.java
@@ -90,4 +90,20 @@ public class ConfigController {
         res.status(200);
         return "";
     };
+
+    public static final Route updatePenalties = (req, res) -> {
+        User user = req.session().attribute("user");
+
+        Gson gson = new Gson();
+        JsonObject jsonObject = gson.fromJson(req.body(), JsonObject.class);
+        Float perDayLatePenalty = gson.fromJson(jsonObject.get("perDayLatePenalty"), Float.class);
+        Float gitCommitPenalty = gson.fromJson(jsonObject.get("gitCommitPenalty"), Float.class);
+        Integer maxLateDaysPenalized = gson.fromJson(jsonObject.get("maxLateDaysPenalized"), Integer.class);
+
+        ConfigService.setMaxLateDays(user, maxLateDaysPenalized);
+        ConfigService.setGitCommitPenalty(user, gitCommitPenalty);
+        ConfigService.setPerDayLatePenalty(user, perDayLatePenalty);
+
+        return "";
+    };
 }
diff --git a/src/main/java/edu/byu/cs/dataAccess/sql/ConfigurationSqlDao.java b/src/main/java/edu/byu/cs/dataAccess/sql/ConfigurationSqlDao.java
index 822bced4..c7865405 100644
--- a/src/main/java/edu/byu/cs/dataAccess/sql/ConfigurationSqlDao.java
+++ b/src/main/java/edu/byu/cs/dataAccess/sql/ConfigurationSqlDao.java
@@ -50,7 +50,7 @@ public <T> T getConfiguration(Configuration key, Class<T> type) throws DataAcces
             statement.setString(1, key.toString());
             var rs = statement.executeQuery();
             if (rs.next()) {
-                return getValue(rs.getString("value"), type);
+                return getValue(key, rs.getString("value"), type);
             }
             throw new DataAccessException("Configuration not found: " + key);
         } catch (Exception e) {
@@ -58,9 +58,9 @@ public <T> T getConfiguration(Configuration key, Class<T> type) throws DataAcces
         }
     }
 
-    private <T> T getValue(String value, Class<T> type) {
+    private <T> T getValue(Configuration key, String value, Class<T> type) {
         if (value.equals(DEFAULT_VALUE)) {
-            LOGGER.warn("Using default configuration value for key: {}", type);
+            LOGGER.warn("Using default configuration value for key: {} of type {}", key, type);
 
             if (type == String.class) {
                 return type.cast("");
@@ -68,6 +68,8 @@ private <T> T getValue(String value, Class<T> type) {
                 return type.cast(0);
             } else if (type == Boolean.class) {
                 return type.cast(false);
+            } else if (type == Float.class) {
+                return type.cast(0f);
             } else {
                 throw new IllegalArgumentException("Unsupported configuration type: " + type);
             }
@@ -81,6 +83,8 @@ private <T> T getValue(String value, Class<T> type) {
             return type.cast(Boolean.parseBoolean(value));
         } else if (type == Instant.class) {
             return type.cast(Instant.parse(value));
+        } else if (type == Float.class) {
+            return type.cast(Float.parseFloat(value));
         } else {
             throw new IllegalArgumentException("Unsupported configuration type: " + type);
         }
diff --git a/src/main/java/edu/byu/cs/server/Server.java b/src/main/java/edu/byu/cs/server/Server.java
index eee8d25a..9adb3165 100644
--- a/src/main/java/edu/byu/cs/server/Server.java
+++ b/src/main/java/edu/byu/cs/server/Server.java
@@ -116,6 +116,8 @@ public static int setupEndpoints(int port) {
 
                     post("/courseIds", updateCourseIdsPost);
                     get("/courseIds", updateCourseIdsUsingCanvasGet);
+
+                    post("/penalties", updatePenalties);
                 });
             });
         });
diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index 52e015cb..742b7df0 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -55,6 +55,14 @@ private static void addBannerConfig(JsonObject response) throws DataAccessExcept
         response.addProperty("bannerExpiration", bannerExpiration.toString());
     }
 
+    private static void addPenaltyConfig(JsonObject response) throws DataAccessException {
+        ConfigurationDao dao = DaoService.getConfigurationDao();
+
+        response.addProperty("perDayLatePenalty", dao.getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class));
+        response.addProperty("gitCommitPenalty", dao.getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class));
+        response.addProperty("maxLateDaysPenalized", dao.getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class));
+    }
+
     private static void clearBannerConfig() throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
@@ -100,6 +108,8 @@ public static JsonObject getPrivateConfig() throws DataAccessException {
         }
 
         JsonObject response = getPublicConfig();
+        addPenaltyConfig(response);
+
         int courseNumber = DaoService.getConfigurationDao().getConfiguration(
                 ConfigurationDao.Configuration.COURSE_NUMBER,
                 Integer.class
diff --git a/src/main/resources/frontend/src/stores/appConfig.ts b/src/main/resources/frontend/src/stores/appConfig.ts
index 5e8a17fe..5750d3c9 100644
--- a/src/main/resources/frontend/src/stores/appConfig.ts
+++ b/src/main/resources/frontend/src/stores/appConfig.ts
@@ -12,6 +12,11 @@ export type Config = {
   bannerLink: string
   bannerColor: string
   bannerExpiration: string
+
+  perDayLatePenalty: number,
+  gitCommitPenalty: number,
+  maxLateDaysPenalized: number,
+
   phases: Array<Phase>
   courseNumber?: number
   assignmentIds?: string // Map<Phase, number>
@@ -49,6 +54,10 @@ export const useAppConfigStore = defineStore('appConfig', () => {
       bannerColor.value = "#4fa0ff"
     }
 
+    perDayLatePenalty.value = latestConfig.perDayLatePenalty
+    gitCommitPenalty.value = latestConfig.gitCommitPenalty
+    maxLateDaysPenalized.value = latestConfig.maxLateDaysPenalized
+
     for (const phase of listOfPhases() as Phase[]) {
       activePhaseList.value[phase] = latestConfig.phases.includes(phase);
     }
@@ -68,6 +77,11 @@ export const useAppConfigStore = defineStore('appConfig', () => {
   const bannerLink: Ref<string> = ref<string>("");
   const bannerColor: Ref<string> = ref<string>("");
   const bannerExpiration: Ref<string> = ref<string>("");
+
+  const perDayLatePenalty = ref<number>(0)
+  const gitCommitPenalty = ref<number>(0)
+  const maxLateDaysPenalized = ref<number>(0)
+
   // using the enum, if phaseActivationList[phase] == true, then that phase is active
   const activePhaseList: Ref<boolean[]> = ref<Array<boolean>>([]);
   const assignmentIds: Ref<Map<Phase, number>> = ref<Map<Phase, number>>(new Map<Phase, number>);
@@ -85,6 +99,9 @@ export const useAppConfigStore = defineStore('appConfig', () => {
     phaseActivationList: activePhaseList,
     rubricInfo,
     assignmentIds,
-    courseNumber
+    courseNumber,
+    perDayLatePenalty,
+    gitCommitPenalty,
+    maxLateDaysPenalized
   };
 })
diff --git a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
index 5f4db841..24f4c430 100644
--- a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
+++ b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
@@ -53,9 +53,9 @@ onMounted( async () => {
 
       </template>
       <template #current>
-        <p><span class="infoLabel">Daily Late Penalty: </span> 10%</p>
-        <p><span class="infoLabel">Max Days Penalized: </span> 5</p>
-        <p><span class="infoLabel">Git Commit Penalty: </span> 10%</p>
+        <p><span class="infoLabel">Daily Late Penalty: </span>{{appConfigStore.perDayLatePenalty * 100}}%</p>
+        <p><span class="infoLabel">Max Days Penalized: </span>{{appConfigStore.maxLateDaysPenalized}} days</p>
+        <p><span class="infoLabel">Git Commit Penalty: </span>{{appConfigStore.gitCommitPenalty * 100}}%</p>
       </template>
     </ConfigSection>
 

From 4c3bde49d9cdd4da672ca10918880a29e4941bca Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 01:31:48 -0700
Subject: [PATCH 04/17] fix floating point math error on front end

---
 .../components/config/BannerConfigEditor.vue  |  7 ++-
 .../config/LivePhaseConfigEditor.vue          |  5 +-
 .../components/config/PenaltyConfigEditor.vue | 63 +++++++++++++++++++
 .../frontend/src/services/configService.ts    |  8 +++
 .../src/views/AdminView/ConfigView.vue        |  7 ++-
 5 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue

diff --git a/src/main/resources/frontend/src/components/config/BannerConfigEditor.vue b/src/main/resources/frontend/src/components/config/BannerConfigEditor.vue
index f6729e96..7c800258 100644
--- a/src/main/resources/frontend/src/components/config/BannerConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/BannerConfigEditor.vue
@@ -31,10 +31,11 @@ const submitBanner = async () => {
   }
   try {
     await setBanner(bannerMessageToSubmit.value, bannerLinkToSubmit.value, bannerColorToSubmit.value, combinedDateTime)
+    closeEditor()
   } catch (e) {
+    appConfigStore.updateConfig()
     alert("There was a problem in saving the updated banner message:\n" + e)
   }
-  closeEditor()
 }
 </script>
 
@@ -65,8 +66,8 @@ const submitBanner = async () => {
   </div>
 
   <div>
-    <button class="small" @click="submitBanner" :disabled="bannerWillExpire && (bannerExpirationDate.length == 0)">Save</button>
-    <button class="small" @click="clearBannerMessage">Clear</button>
+    <button @click="submitBanner" :disabled="bannerWillExpire && (bannerExpirationDate.length == 0)">Submit</button>
+    <button class="small" @click="clearBannerMessage">Clear Editor</button>
   </div>
 </template>
 
diff --git a/src/main/resources/frontend/src/components/config/LivePhaseConfigEditor.vue b/src/main/resources/frontend/src/components/config/LivePhaseConfigEditor.vue
index de746ea9..8ebee204 100644
--- a/src/main/resources/frontend/src/components/config/LivePhaseConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/LivePhaseConfigEditor.vue
@@ -24,10 +24,11 @@ const submitLivePhases = async () => {
 
   try {
     await setLivePhases(livePhases)
+    closeEditor()
   } catch (e) {
+    appConfigStore.updateConfig()
     alert("There was a problem in saving live phases")
   }
-  closeEditor()
 }
 </script>
 
@@ -44,7 +45,7 @@ const submitLivePhases = async () => {
       <button @click="setAllPhases(true)" class="small">Enable all</button>
       <button @click="setAllPhases(false)" class="small">Disable all</button>
     </div>
-    <button @click="submitLivePhases">Submit Changes</button>
+    <button @click="submitLivePhases">Submit</button>
   </div>
 </template>
 
diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
new file mode 100644
index 00000000..859301fa
--- /dev/null
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { useAppConfigStore } from '@/stores/appConfig'
+import { ref } from 'vue'
+import { setPenalties } from '@/services/configService'
+
+const { closeEditor } = defineProps<{
+  closeEditor: () => void
+}>();
+
+const appConfig = useAppConfigStore();
+
+const gitPenalty = ref<number>(Math.round(appConfig.gitCommitPenalty * 100))
+const latePenalty = ref<number>(Math.round(appConfig.perDayLatePenalty * 100))
+const maxLateDays = ref<number>(appConfig.maxLateDaysPenalized)
+
+const submit = async () => {
+  try {
+    await setPenalties(maxLateDays.value, gitPenalty.value / 100, latePenalty.value / 100)
+    closeEditor()
+  } catch (e) {
+    appConfig.updateConfig()
+    alert("There was a problem saving the penalties")
+  }
+}
+</script>
+
+<template>
+  <div class="penalty">
+    <p class="penaltyName">Git Commit Penalty</p>
+    <p class="penaltyDescription">Applied when students don't have enough commits</p>
+    <p><input type="number" v-model="gitPenalty"/>%</p>
+  </div>
+
+  <div class="penalty">
+    <p class="penaltyName">Late Penalty</p>
+    <p class="penaltyDescription">Applied per day the submission is late</p>
+    <p><input type="number" v-model="latePenalty"/>%</p>
+  </div>
+
+  <div class="penalty">
+    <p class="penaltyName">Max Late Days</p>
+    <p class="penaltyDescription">Days after which the late penalty caps out</p>
+    <p><input type="number" v-model="maxLateDays"/> days</p>
+  </div>
+
+  <button @click="submit">Submit</button>
+</template>
+
+<style scoped>
+.penaltyName {
+  font-weight: bold;
+}
+.penaltyDescription {
+  font-style: italic;
+}
+.penalty {
+  margin-top: 5px;
+}
+
+button {
+  margin-top: 15px;
+}
+</style>
diff --git a/src/main/resources/frontend/src/services/configService.ts b/src/main/resources/frontend/src/services/configService.ts
index 605b266f..653c7206 100644
--- a/src/main/resources/frontend/src/services/configService.ts
+++ b/src/main/resources/frontend/src/services/configService.ts
@@ -13,6 +13,14 @@ export const getConfig = async ():Promise<Config> => {
   return await ServerCommunicator.getRequest<Config>(endpoint)
 }
 
+export const setPenalties = async (maxLateDaysPenalized: number, gitCommitPenalty: number, perDayLatePenalty: number) => {
+  await doSetConfigItem("POST", '/api/admin/config/penalties', {
+    maxLateDaysPenalized: maxLateDaysPenalized,
+    gitCommitPenalty: gitCommitPenalty,
+    perDayLatePenalty: perDayLatePenalty,
+  })
+}
+
 export const setBanner = async (message: String, link: String, color: String, expirationTimestamp: String): Promise<void> => {
   await doSetConfigItem("POST", '/api/admin/config/banner', {
     "bannerMessage": message,
diff --git a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
index 24f4c430..e0ef45f2 100644
--- a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
+++ b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
@@ -4,6 +4,7 @@ import { listOfPhases } from '@/types/types'
 import { useAppConfigStore } from '@/stores/appConfig'
 import { generateClickableLink, readableTimestamp } from '@/utils/utils'
 import ConfigSection from '@/components/config/ConfigSection.vue'
+import PenaltyConfigEditor from '@/components/config/PenaltyConfigEditor.vue'
 
 // Lazy Load Editor Components
 const BannerConfigEditor = defineAsyncComponent(() => import('@/components/config/BannerConfigEditor.vue'))
@@ -50,12 +51,12 @@ onMounted( async () => {
 
     <ConfigSection title="Penalties" description="Values used for calculating penalties">
       <template #editor="{ closeEditor }">
-
+        <PenaltyConfigEditor :closeEditor="closeEditor"/>
       </template>
       <template #current>
-        <p><span class="infoLabel">Daily Late Penalty: </span>{{appConfigStore.perDayLatePenalty * 100}}%</p>
+        <p><span class="infoLabel">Git Commit Penalty: </span>{{Math.round(appConfigStore.gitCommitPenalty * 100)}}%</p>
+        <p><span class="infoLabel">Late Penalty: </span>{{Math.round(appConfigStore.perDayLatePenalty * 100)}}%</p>
         <p><span class="infoLabel">Max Days Penalized: </span>{{appConfigStore.maxLateDaysPenalized}} days</p>
-        <p><span class="infoLabel">Git Commit Penalty: </span>{{appConfigStore.gitCommitPenalty * 100}}%</p>
       </template>
     </ConfigSection>
 

From 603c3bc87107e538fdf696eef03c44794e0678dc Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 01:46:07 -0700
Subject: [PATCH 05/17] add argument validation on front and backend

---
 src/main/java/edu/byu/cs/service/ConfigService.java | 12 ++++++++++++
 .../src/components/config/PenaltyConfigEditor.vue   | 13 +++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index 742b7df0..b1619cfe 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -223,6 +223,10 @@ public static void updateCourseIdsUsingCanvas(User user) throws CanvasException,
     }
 
     public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessException {
+        if (maxDays < 0) {
+            throw new IllegalArgumentException("Max Late Days must be non-negative");
+        }
+
         ConfigurationDao dao = DaoService.getConfigurationDao();
         dao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
         logConfigChange("set maximum late days penalized to %s".formatted(maxDays), user.netId());
@@ -235,6 +239,10 @@ public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessE
      *                      passed in as 0.1
      */
     public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws DataAccessException {
+        if ((perDayPenalty < 0) || (perDayPenalty > 1)) {
+            throw new IllegalArgumentException("Per Day Late Penalty must be 0-1");
+        }
+
         ConfigurationDao dao = DaoService.getConfigurationDao();
         dao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
         logConfigChange("set the per day late penalty to %s".formatted(perDayPenalty), user.netId());
@@ -247,6 +255,10 @@ public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws D
      *                         penalty per day should be passed in as 0.1
      */
     public static void setGitCommitPenalty(User user, Float gitCommitPenalty) throws DataAccessException {
+        if ((gitCommitPenalty < 0) || (gitCommitPenalty > 1)) {
+            throw new IllegalArgumentException("Git Commit Penalty must be 0-1");
+        }
+
         ConfigurationDao dao = DaoService.getConfigurationDao();
         dao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
         logConfigChange("set the git commit penalty to %s".formatted(gitCommitPenalty), user.netId());
diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
index 859301fa..6c5aa41c 100644
--- a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -13,6 +13,12 @@ const gitPenalty = ref<number>(Math.round(appConfig.gitCommitPenalty * 100))
 const latePenalty = ref<number>(Math.round(appConfig.perDayLatePenalty * 100))
 const maxLateDays = ref<number>(appConfig.maxLateDaysPenalized)
 
+const valuesReady = () => {
+  return (gitPenalty.value >= 0) && (gitPenalty.value <= 100)
+    && (latePenalty.value >= 0) && (latePenalty.value <= 100)
+    && (maxLateDays.value >= 0)
+}
+
 const submit = async () => {
   try {
     await setPenalties(maxLateDays.value, gitPenalty.value / 100, latePenalty.value / 100)
@@ -43,7 +49,8 @@ const submit = async () => {
     <p><input type="number" v-model="maxLateDays"/> days</p>
   </div>
 
-  <button @click="submit">Submit</button>
+  <button :disabled="!valuesReady()" @click="submit">Submit</button>
+  <p v-if="!valuesReady()" style="max-width: 350px"><em>All values must be non-negative, and penalties must be equal to or less than 100%</em></p>
 </template>
 
 <style scoped>
@@ -56,8 +63,10 @@ const submit = async () => {
 .penalty {
   margin-top: 5px;
 }
-
 button {
   margin-top: 15px;
 }
+input {
+  max-width: 75px;
+}
 </style>

From 94307a65c132f5b635b169b3ed885510b3d38dde Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 01:57:15 -0700
Subject: [PATCH 06/17] skip logging if value didn't change

---
 .../java/edu/byu/cs/service/ConfigService.java  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index b1619cfe..fde59159 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -22,17 +22,18 @@
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class ConfigService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConfigService.class);
 
     private static void logConfigChange(String changeMessage, String adminNetId) {
-        LOGGER.info("[CONFIG] Admin {} has {}}", adminNetId, changeMessage);
+        LOGGER.info("[CONFIG] Admin {} has {}", adminNetId, changeMessage);
     }
 
     private static void logAutomaticConfigChange(String changeMessage) {
-        LOGGER.info("[CONFIG] Automatic change: {}}", changeMessage);
+        LOGGER.info("[CONFIG] Automatic change: {}", changeMessage);
     }
 
     /**
@@ -228,6 +229,10 @@ public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessE
         }
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
+
+        Integer current = dao.getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
+        if (current.equals(maxDays)) { return; }
+
         dao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
         logConfigChange("set maximum late days penalized to %s".formatted(maxDays), user.netId());
     }
@@ -244,6 +249,10 @@ public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws D
         }
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
+
+        Float current = dao.getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class);
+        if (current.equals(perDayPenalty)) { return; }
+
         dao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
         logConfigChange("set the per day late penalty to %s".formatted(perDayPenalty), user.netId());
     }
@@ -260,6 +269,10 @@ public static void setGitCommitPenalty(User user, Float gitCommitPenalty) throws
         }
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
+
+        Float current = dao.getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class);
+        if (current.equals(gitCommitPenalty)) { return; }
+
         dao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
         logConfigChange("set the git commit penalty to %s".formatted(gitCommitPenalty), user.netId());
     }

From 4b66a9f58c25b6ff53acc4bc9482d1929a04f03b Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Thu, 14 Nov 2024 10:08:02 -0700
Subject: [PATCH 07/17] integrate late penalty values

---
 .../cs/autograder/score/LateDayCalculator.java |  8 +++-----
 .../edu/byu/cs/autograder/score/Scorer.java    | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/edu/byu/cs/autograder/score/LateDayCalculator.java b/src/main/java/edu/byu/cs/autograder/score/LateDayCalculator.java
index fe340f8b..d9aeafe2 100644
--- a/src/main/java/edu/byu/cs/autograder/score/LateDayCalculator.java
+++ b/src/main/java/edu/byu/cs/autograder/score/LateDayCalculator.java
@@ -3,6 +3,7 @@
 import edu.byu.cs.autograder.GradingException;
 import edu.byu.cs.canvas.CanvasException;
 import edu.byu.cs.canvas.CanvasService;
+import edu.byu.cs.dataAccess.ConfigurationDao;
 import edu.byu.cs.dataAccess.DaoService;
 import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Phase;
@@ -30,10 +31,6 @@ public class LateDayCalculator {
     private static final Logger LOGGER = Logger.getLogger(LateDayCalculator.class.getName());
 
 
-    /**
-     * The max number of days that the late penalty should be applied for.
-     */
-    private static final int MAX_LATE_DAYS_TO_PENALIZE = 5;
     private Set<LocalDate> publicHolidays;
 
     public LateDayCalculator() {
@@ -54,7 +51,8 @@ public int calculateLateDays(Phase phase, String netId) throws GradingException,
         }
 
         ZonedDateTime handInDate = ScorerHelper.getHandInDateZoned(netId);
-        return Math.min(getNumDaysLate(handInDate, dueDate), MAX_LATE_DAYS_TO_PENALIZE);
+        int maxLateDaysToPenalize = DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
+        return Math.min(getNumDaysLate(handInDate, dueDate), maxLateDaysToPenalize);
     }
 
     /**
diff --git a/src/main/java/edu/byu/cs/autograder/score/Scorer.java b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
index b4402c08..4e747400 100644
--- a/src/main/java/edu/byu/cs/autograder/score/Scorer.java
+++ b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
@@ -9,6 +9,7 @@
 import edu.byu.cs.canvas.model.CanvasRubricAssessment;
 import edu.byu.cs.canvas.model.CanvasRubricItem;
 import edu.byu.cs.canvas.model.CanvasSubmission;
+import edu.byu.cs.dataAccess.ConfigurationDao;
 import edu.byu.cs.dataAccess.DaoService;
 import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.dataAccess.UserDao;
@@ -33,11 +34,17 @@ public class Scorer {
      * The penalty to be applied per day to a late submission.
      * This is out of 1. So putting 0.1 would be a 10% deduction per day
      */
-    private static final float PER_DAY_LATE_PENALTY = 0.1F;
+    private final float PER_DAY_LATE_PENALTY;
     private final GradingContext gradingContext;
 
     public Scorer(GradingContext gradingContext) {
         this.gradingContext = gradingContext;
+        try {
+            PER_DAY_LATE_PENALTY = DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class);
+        } catch (DataAccessException e) {
+            LOGGER.error("Error while getting Per Day Late Penalty for Scorer.");
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -394,8 +401,13 @@ public Submission generateSubmissionObject(Rubric rubric, CommitVerificationResu
         String headHash = commitVerificationResult.headHash();
         String netId = gradingContext.netId();
 
-        if (numDaysLate > 0)
-            notes += " " + numDaysLate + " days late. -" + (int)(numDaysLate * PER_DAY_LATE_PENALTY * 100) + "%";
+        Integer maxLateDays = DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
+
+        if (numDaysLate >= maxLateDays)
+            notes += " Late penalty maxed out at " + numDaysLate + " days late: -";
+        else if (numDaysLate > 0)
+            notes += " " + numDaysLate + " days late: -";
+        notes += (int)(numDaysLate * PER_DAY_LATE_PENALTY * 100) + "%";
 
         ZonedDateTime handInDate = ScorerHelper.getHandInDateZoned(netId);
         Submission.VerifiedStatus verifiedStatus;

From e0c041b2ed40c47e1ae2a0b3615756ced24d6857 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Fri, 15 Nov 2024 19:39:04 -0700
Subject: [PATCH 08/17] add git commit penalty

---
 .../edu/byu/cs/autograder/score/Scorer.java   |  2 +-
 .../edu/byu/cs/service/SubmissionService.java |  3 +-
 src/main/java/edu/byu/cs/util/PhaseUtils.java |  7 ++-
 .../src/components/config/ConfigSection.vue   |  4 +-
 .../components/config/PenaltyConfigEditor.vue | 47 +++++++++++++------
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/main/java/edu/byu/cs/autograder/score/Scorer.java b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
index 4e747400..4389f1f4 100644
--- a/src/main/java/edu/byu/cs/autograder/score/Scorer.java
+++ b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
@@ -407,7 +407,7 @@ public Submission generateSubmissionObject(Rubric rubric, CommitVerificationResu
             notes += " Late penalty maxed out at " + numDaysLate + " days late: -";
         else if (numDaysLate > 0)
             notes += " " + numDaysLate + " days late: -";
-        notes += (int)(numDaysLate * PER_DAY_LATE_PENALTY * 100) + "%";
+        notes += (int)(numDaysLate * PER_DAY_LATE_PENALTY * 100) + "% ";
 
         ZonedDateTime handInDate = ScorerHelper.getHandInDateZoned(netId);
         Submission.VerifiedStatus verifiedStatus;
diff --git a/src/main/java/edu/byu/cs/service/SubmissionService.java b/src/main/java/edu/byu/cs/service/SubmissionService.java
index 6ba4fc5c..f594c978 100644
--- a/src/main/java/edu/byu/cs/service/SubmissionService.java
+++ b/src/main/java/edu/byu/cs/service/SubmissionService.java
@@ -184,8 +184,7 @@ public static Collection<Submission> getSubmissionsForUser(String netId) throws
     public static void approveSubmission(String adminNetId, ApprovalRequest request) throws GradingException, DataAccessException {
         int penalty = 0;
         if (request.penalize()) {
-            //TODO: Put somewhere better/more configurable
-            penalty = 10;
+            penalty = Math.round((DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class) * 100));
         }
 
         SubmissionUtils.approveSubmission(request.netId(), request.phase(), adminNetId, penalty);
diff --git a/src/main/java/edu/byu/cs/util/PhaseUtils.java b/src/main/java/edu/byu/cs/util/PhaseUtils.java
index 03f6dad0..9c7f8879 100644
--- a/src/main/java/edu/byu/cs/util/PhaseUtils.java
+++ b/src/main/java/edu/byu/cs/util/PhaseUtils.java
@@ -170,7 +170,12 @@ public static float extraCreditValue(Phase phase) {
 
     public static CommitVerificationConfig verificationConfig(Phase phase) throws GradingException {
         int minimumLinesChanged = 5;
-        int penaltyPct = 10;
+        int penaltyPct;
+        try {
+            penaltyPct = Math.round(DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class) * 100);
+        } catch (DataAccessException e) {
+            throw new GradingException("Error getting git commit penalty", e);
+        }
         int forgivenessMinutesHead = 3;
         return switch (phase) {
             case Phase0, Phase1 -> new CommitVerificationConfig(8, 2, minimumLinesChanged, penaltyPct, forgivenessMinutesHead);
diff --git a/src/main/resources/frontend/src/components/config/ConfigSection.vue b/src/main/resources/frontend/src/components/config/ConfigSection.vue
index a35d2e74..8b14281a 100644
--- a/src/main/resources/frontend/src/components/config/ConfigSection.vue
+++ b/src/main/resources/frontend/src/components/config/ConfigSection.vue
@@ -57,7 +57,9 @@ const closeEditor = () => {
       v-if="editorPopup"
       @closePopUp="editorPopup = false">
       <h3>Edit {{ title }}</h3>
-      <slot name="editor" :closeEditor="closeEditor"/>
+      <div style="max-width: 600px">
+        <slot name="editor" :closeEditor="closeEditor"/>
+      </div>
     </PopUp>
   </section>
 </template>
diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
index 6c5aa41c..5d347513 100644
--- a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -32,35 +32,54 @@ const submit = async () => {
 
 <template>
   <div class="penalty">
-    <p class="penaltyName">Git Commit Penalty</p>
-    <p class="penaltyDescription">Applied when students don't have enough commits</p>
-    <p><input type="number" v-model="gitPenalty"/>%</p>
+    <div class="value">
+      <p class="valueName">Late Penalty</p>
+      <p class="valueDescription">Applied per day the submission is late</p>
+      <p><input type="number" v-model="latePenalty"/>%</p>
+    </div>
+    <div class="value">
+      <p class="valueName">Max Late Days</p>
+      <p class="valueDescription">Days after which the late penalty caps out</p>
+      <p><input type="number" v-model="maxLateDays"/> days</p>
+    </div>
   </div>
 
-  <div class="penalty">
-    <p class="penaltyName">Late Penalty</p>
-    <p class="penaltyDescription">Applied per day the submission is late</p>
-    <p><input type="number" v-model="latePenalty"/>%</p>
-  </div>
+  <hr style="width: 100%; color: black; margin-top: 10px;"/>
 
   <div class="penalty">
-    <p class="penaltyName">Max Late Days</p>
-    <p class="penaltyDescription">Days after which the late penalty caps out</p>
-    <p><input type="number" v-model="maxLateDays"/> days</p>
+    <div class="value">
+      <p class="valueName">Git Commit Penalty</p>
+      <p class="valueDescription">Applied when students don't have enough commits</p>
+      <p><input type="number" v-model="gitPenalty"/>%</p>
+    </div>
+    <div class="value">
+      <p class="valueName">Lines Changed Per Commit</p>
+      <p class="valueDescription">The minimum number of lines that must change for a commit to count.</p>
+      <p><input type="number" v-model="gitPenalty"/> lines</p>
+    </div>
+    <div class="value">
+      <p class="valueName">Clock Variability</p>
+      <p class="valueDescription">The commit checker will block if commits are authored in the future.
+        This value controls how far in the future a student's commit can be to account for differences in system time.</p>
+      <p><input type="number" v-model="gitPenalty"/> minutes</p>
+    </div>
   </div>
 
+
+
   <button :disabled="!valuesReady()" @click="submit">Submit</button>
   <p v-if="!valuesReady()" style="max-width: 350px"><em>All values must be non-negative, and penalties must be equal to or less than 100%</em></p>
+  <p><em>None of these values affect admin submissions</em></p>
 </template>
 
 <style scoped>
-.penaltyName {
+.valueName {
   font-weight: bold;
 }
-.penaltyDescription {
+.valueDescription {
   font-style: italic;
 }
-.penalty {
+.value {
   margin-top: 5px;
 }
 button {

From 084aa5ac71ec7048d21f34b77ed63fe9be75e8b4 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Sat, 16 Nov 2024 11:53:02 -0700
Subject: [PATCH 09/17] simplify use of Configuration enums

---
 .../edu/byu/cs/service/ConfigService.java     | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index fde59159..18a855d0 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -5,6 +5,7 @@
 import edu.byu.cs.canvas.CanvasIntegrationImpl;
 import edu.byu.cs.canvas.model.CanvasAssignment;
 import edu.byu.cs.dataAccess.ConfigurationDao;
+import edu.byu.cs.dataAccess.ConfigurationDao.Configuration;
 import edu.byu.cs.dataAccess.DaoService;
 import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.*;
@@ -22,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.Map;
-import java.util.Objects;
 
 public class ConfigService {
 
@@ -44,33 +44,33 @@ private static void logAutomaticConfigChange(String changeMessage) {
      */
     private static void addBannerConfig(JsonObject response) throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
-        Instant bannerExpiration = dao.getConfiguration(ConfigurationDao.Configuration.BANNER_EXPIRATION, Instant.class);
+        Instant bannerExpiration = dao.getConfiguration(Configuration.BANNER_EXPIRATION, Instant.class);
 
         if (bannerExpiration.isBefore(Instant.now())) { //Banner has expired
             clearBannerConfig();
         }
 
-        response.addProperty("bannerMessage", dao.getConfiguration(ConfigurationDao.Configuration.BANNER_MESSAGE, String.class));
-        response.addProperty("bannerLink", dao.getConfiguration(ConfigurationDao.Configuration.BANNER_LINK, String.class));
-        response.addProperty("bannerColor", dao.getConfiguration(ConfigurationDao.Configuration.BANNER_COLOR, String.class));
+        response.addProperty("bannerMessage", dao.getConfiguration(Configuration.BANNER_MESSAGE, String.class));
+        response.addProperty("bannerLink", dao.getConfiguration(Configuration.BANNER_LINK, String.class));
+        response.addProperty("bannerColor", dao.getConfiguration(Configuration.BANNER_COLOR, String.class));
         response.addProperty("bannerExpiration", bannerExpiration.toString());
     }
 
     private static void addPenaltyConfig(JsonObject response) throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        response.addProperty("perDayLatePenalty", dao.getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class));
-        response.addProperty("gitCommitPenalty", dao.getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class));
-        response.addProperty("maxLateDaysPenalized", dao.getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class));
+        response.addProperty("perDayLatePenalty", dao.getConfiguration(Configuration.PER_DAY_LATE_PENALTY, Float.class));
+        response.addProperty("gitCommitPenalty", dao.getConfiguration(Configuration.GIT_COMMIT_PENALTY, Float.class));
+        response.addProperty("maxLateDaysPenalized", dao.getConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class));
     }
 
     private static void clearBannerConfig() throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_MESSAGE, "", String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_LINK, "", String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_COLOR, "", String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_EXPIRATION, Instant.MAX, Instant.class);
+        dao.setConfiguration(Configuration.BANNER_MESSAGE, "", String.class);
+        dao.setConfiguration(Configuration.BANNER_LINK, "", String.class);
+        dao.setConfiguration(Configuration.BANNER_COLOR, "", String.class);
+        dao.setConfiguration(Configuration.BANNER_EXPIRATION, Instant.MAX, Instant.class);
 
         logAutomaticConfigChange("Banner message has expired");
     }
@@ -81,7 +81,7 @@ public static JsonObject getPublicConfig() throws DataAccessException {
         JsonObject response = new JsonObject();
 
         addBannerConfig(response);
-        response.addProperty("phases", dao.getConfiguration(ConfigurationDao.Configuration.STUDENT_SUBMISSIONS_ENABLED, String.class));
+        response.addProperty("phases", dao.getConfiguration(Configuration.STUDENT_SUBMISSIONS_ENABLED, String.class));
 
         return response;
     }
@@ -112,7 +112,7 @@ public static JsonObject getPrivateConfig() throws DataAccessException {
         addPenaltyConfig(response);
 
         int courseNumber = DaoService.getConfigurationDao().getConfiguration(
-                ConfigurationDao.Configuration.COURSE_NUMBER,
+                Configuration.COURSE_NUMBER,
                 Integer.class
         );
         response.addProperty("courseNumber", courseNumber);
@@ -124,7 +124,7 @@ public static JsonObject getPrivateConfig() throws DataAccessException {
     public static void updateLivePhases(ArrayList phasesArray, User user) throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        dao.setConfiguration(ConfigurationDao.Configuration.STUDENT_SUBMISSIONS_ENABLED, phasesArray, ArrayList.class);
+        dao.setConfiguration(Configuration.STUDENT_SUBMISSIONS_ENABLED, phasesArray, ArrayList.class);
 
         logConfigChange("set the following phases as live: %s".formatted(phasesArray), user.netId());
     }
@@ -150,10 +150,10 @@ public static void updateBannerMessage(User user, String expirationString, Strin
             throw new IllegalArgumentException("Invalid hex color code. Must provide a hex code starting with a # symbol, followed by 6 hex digits");
         }
 
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_MESSAGE, message, String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_LINK, link, String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_COLOR, color, String.class);
-        dao.setConfiguration(ConfigurationDao.Configuration.BANNER_EXPIRATION, expirationTimestamp, Instant.class);
+        dao.setConfiguration(Configuration.BANNER_MESSAGE, message, String.class);
+        dao.setConfiguration(Configuration.BANNER_LINK, link, String.class);
+        dao.setConfiguration(Configuration.BANNER_COLOR, color, String.class);
+        dao.setConfiguration(Configuration.BANNER_EXPIRATION, expirationTimestamp, Instant.class);
 
         if (message.isEmpty()) {
             logConfigChange("cleared the banner message", user.netId());
@@ -178,7 +178,7 @@ public static void updateCourseIds(User user, SetCourseIdsRequest setCourseIdsRe
 
         // Course Number
         DaoService.getConfigurationDao().setConfiguration(
-                ConfigurationDao.Configuration.COURSE_NUMBER,
+                Configuration.COURSE_NUMBER,
                 setCourseIdsRequest.courseNumber(),
                 Integer.class
         );
@@ -230,10 +230,10 @@ public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessE
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        Integer current = dao.getConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
+        Integer current = dao.getConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
         if (current.equals(maxDays)) { return; }
 
-        dao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
+        dao.setConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
         logConfigChange("set maximum late days penalized to %s".formatted(maxDays), user.netId());
     }
 
@@ -250,10 +250,10 @@ public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws D
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        Float current = dao.getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class);
+        Float current = dao.getConfiguration(Configuration.PER_DAY_LATE_PENALTY, Float.class);
         if (current.equals(perDayPenalty)) { return; }
 
-        dao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
+        dao.setConfiguration(Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
         logConfigChange("set the per day late penalty to %s".formatted(perDayPenalty), user.netId());
     }
 
@@ -270,10 +270,10 @@ public static void setGitCommitPenalty(User user, Float gitCommitPenalty) throws
 
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        Float current = dao.getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class);
+        Float current = dao.getConfiguration(Configuration.GIT_COMMIT_PENALTY, Float.class);
         if (current.equals(gitCommitPenalty)) { return; }
 
-        dao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
+        dao.setConfiguration(Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
         logConfigChange("set the git commit penalty to %s".formatted(gitCommitPenalty), user.netId());
     }
 }

From bf0502104a8ec089227092bc9829bd94190719b0 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:25:39 -0700
Subject: [PATCH 10/17] simplify processing of penalty request

---
 .../byu/cs/controller/ConfigController.java   | 17 ++---
 .../byu/cs/dataAccess/ConfigurationDao.java   |  4 +-
 .../request/ConfigPenaltyUpdateRequest.java   |  9 +++
 .../edu/byu/cs/service/ConfigService.java     | 71 +++++++++----------
 4 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 src/main/java/edu/byu/cs/model/request/ConfigPenaltyUpdateRequest.java

diff --git a/src/main/java/edu/byu/cs/controller/ConfigController.java b/src/main/java/edu/byu/cs/controller/ConfigController.java
index 896285c7..5fcdfa8f 100644
--- a/src/main/java/edu/byu/cs/controller/ConfigController.java
+++ b/src/main/java/edu/byu/cs/controller/ConfigController.java
@@ -4,7 +4,9 @@
 import com.google.gson.JsonObject;
 import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.*;
+import edu.byu.cs.model.request.ConfigPenaltyUpdateRequest;
 import edu.byu.cs.service.ConfigService;
+import edu.byu.cs.util.Serializer;
 import spark.Route;
 
 import java.util.ArrayList;
@@ -94,15 +96,14 @@ public class ConfigController {
     public static final Route updatePenalties = (req, res) -> {
         User user = req.session().attribute("user");
 
-        Gson gson = new Gson();
-        JsonObject jsonObject = gson.fromJson(req.body(), JsonObject.class);
-        Float perDayLatePenalty = gson.fromJson(jsonObject.get("perDayLatePenalty"), Float.class);
-        Float gitCommitPenalty = gson.fromJson(jsonObject.get("gitCommitPenalty"), Float.class);
-        Integer maxLateDaysPenalized = gson.fromJson(jsonObject.get("maxLateDaysPenalized"), Integer.class);
+        ConfigPenaltyUpdateRequest request = Serializer.deserialize(req.body(), ConfigPenaltyUpdateRequest.class);
 
-        ConfigService.setMaxLateDays(user, maxLateDaysPenalized);
-        ConfigService.setGitCommitPenalty(user, gitCommitPenalty);
-        ConfigService.setPerDayLatePenalty(user, perDayLatePenalty);
+        try {
+            ConfigService.processPenaltyUpdates(user, request);
+        } catch (DataAccessException e) {
+            res.status(500);
+            res.body(e.getMessage());
+        }
 
         return "";
     };
diff --git a/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java b/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
index 367c7861..0ef0c6cc 100644
--- a/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
+++ b/src/main/java/edu/byu/cs/dataAccess/ConfigurationDao.java
@@ -20,6 +20,8 @@ enum Configuration {
         COURSE_NUMBER,
         MAX_LATE_DAYS_TO_PENALIZE,
         PER_DAY_LATE_PENALTY,
-        GIT_COMMIT_PENALTY
+        GIT_COMMIT_PENALTY,
+        LINES_PER_COMMIT_REQUIRED,
+        CLOCK_FORGIVENESS_MINUTES
     }
 }
diff --git a/src/main/java/edu/byu/cs/model/request/ConfigPenaltyUpdateRequest.java b/src/main/java/edu/byu/cs/model/request/ConfigPenaltyUpdateRequest.java
new file mode 100644
index 00000000..0bb481d3
--- /dev/null
+++ b/src/main/java/edu/byu/cs/model/request/ConfigPenaltyUpdateRequest.java
@@ -0,0 +1,9 @@
+package edu.byu.cs.model.request;
+
+public record ConfigPenaltyUpdateRequest(
+        float perDayLatePenalty,
+        int maxLateDaysPenalized,
+        float gitCommitPenalty,
+        int linesChangedPerCommit,
+        int clockForgivenessMinutes
+) {}
diff --git a/src/main/java/edu/byu/cs/service/ConfigService.java b/src/main/java/edu/byu/cs/service/ConfigService.java
index 18a855d0..837f861e 100644
--- a/src/main/java/edu/byu/cs/service/ConfigService.java
+++ b/src/main/java/edu/byu/cs/service/ConfigService.java
@@ -9,6 +9,7 @@
 import edu.byu.cs.dataAccess.DaoService;
 import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.*;
+import edu.byu.cs.model.request.ConfigPenaltyUpdateRequest;
 import edu.byu.cs.util.PhaseUtils;
 import edu.byu.cs.util.Serializer;
 import org.slf4j.Logger;
@@ -62,6 +63,8 @@ private static void addPenaltyConfig(JsonObject response) throws DataAccessExcep
         response.addProperty("perDayLatePenalty", dao.getConfiguration(Configuration.PER_DAY_LATE_PENALTY, Float.class));
         response.addProperty("gitCommitPenalty", dao.getConfiguration(Configuration.GIT_COMMIT_PENALTY, Float.class));
         response.addProperty("maxLateDaysPenalized", dao.getConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class));
+        response.addProperty("linesChangedPerCommit", dao.getConfiguration(Configuration.LINES_PER_COMMIT_REQUIRED, Integer.class));
+        response.addProperty("clockForgivenessMinutes", dao.getConfiguration(Configuration.CLOCK_FORGIVENESS_MINUTES, Integer.class));
     }
 
     private static void clearBannerConfig() throws DataAccessException {
@@ -223,57 +226,49 @@ public static void updateCourseIdsUsingCanvas(User user) throws CanvasException,
         );
     }
 
-    public static void setMaxLateDays(User user, Integer maxDays) throws DataAccessException {
-        if (maxDays < 0) {
-            throw new IllegalArgumentException("Max Late Days must be non-negative");
-        }
-
-        ConfigurationDao dao = DaoService.getConfigurationDao();
-
-        Integer current = dao.getConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, Integer.class);
-        if (current.equals(maxDays)) { return; }
-
-        dao.setConfiguration(Configuration.MAX_LATE_DAYS_TO_PENALIZE, maxDays, Integer.class);
-        logConfigChange("set maximum late days penalized to %s".formatted(maxDays), user.netId());
+    public static void processPenaltyUpdates(User user, ConfigPenaltyUpdateRequest request) throws DataAccessException {
+        validateValidPercentFloat(request.gitCommitPenalty(), "Git Commit Penalty");
+        validateValidPercentFloat(request.perDayLatePenalty(), "Per Day Late Penalty");
+        validateNonNegativeInt(request.clockForgivenessMinutes(), "Clock Forgiveness Minutes");
+        validateNonNegativeInt(request.maxLateDaysPenalized(), "Max Late Days Penalized");
+        validateNonNegativeInt(request.linesChangedPerCommit(), "Lines Changed Per Commit");
+
+        setConfigItem(user, Configuration.GIT_COMMIT_PENALTY, request.gitCommitPenalty(), Float.class);
+        setConfigItem(user, Configuration.PER_DAY_LATE_PENALTY, request.perDayLatePenalty(), Float.class);
+        setConfigItem(user, Configuration.CLOCK_FORGIVENESS_MINUTES, request.clockForgivenessMinutes(), Integer.class);
+        setConfigItem(user, Configuration.MAX_LATE_DAYS_TO_PENALIZE, request.maxLateDaysPenalized(), Integer.class);
+        setConfigItem(user, Configuration.LINES_PER_COMMIT_REQUIRED, request.linesChangedPerCommit(), Integer.class);
     }
 
     /**
-     *
-     * @param user the user making the change
-     * @param perDayPenalty the penalty per day that should be applied. For example, a 10% penalty per day should be
-     *                      passed in as 0.1
+     * throws IllegalArgumentException if percent is not valid
+     * @param percent a float that should be between 0 and 1 (inclusive)
+     * @param name the name of the value, only used when throwing the exception
      */
-    public static void setPerDayLatePenalty(User user, Float perDayPenalty) throws DataAccessException {
-        if ((perDayPenalty < 0) || (perDayPenalty > 1)) {
-            throw new IllegalArgumentException("Per Day Late Penalty must be 0-1");
+    private static void validateValidPercentFloat(float percent, String name) {
+        if ((percent < 0) || (percent > 1)) {
+            throw new IllegalArgumentException(name + " must be 0-1");
         }
-
-        ConfigurationDao dao = DaoService.getConfigurationDao();
-
-        Float current = dao.getConfiguration(Configuration.PER_DAY_LATE_PENALTY, Float.class);
-        if (current.equals(perDayPenalty)) { return; }
-
-        dao.setConfiguration(Configuration.PER_DAY_LATE_PENALTY, perDayPenalty, Float.class);
-        logConfigChange("set the per day late penalty to %s".formatted(perDayPenalty), user.netId());
     }
 
     /**
-     *
-     * @param user the user making the change
-     * @param gitCommitPenalty the penalty should be applied for not having enough commits. For example, a 10%
-     *                         penalty per day should be passed in as 0.1
+     * throws IllegalArgumentException if value is negative
+     * @param value
+     * @param name name of the value, used when throwing the exception
      */
-    public static void setGitCommitPenalty(User user, Float gitCommitPenalty) throws DataAccessException {
-        if ((gitCommitPenalty < 0) || (gitCommitPenalty > 1)) {
-            throw new IllegalArgumentException("Git Commit Penalty must be 0-1");
+    private static void validateNonNegativeInt(int value, String name) {
+        if (value < 0) {
+            throw new IllegalArgumentException(name + " must be non-negative");
         }
+    }
 
+    private static <T> void setConfigItem(User admin, Configuration configKey, T value, Class<T> type) throws DataAccessException {
         ConfigurationDao dao = DaoService.getConfigurationDao();
 
-        Float current = dao.getConfiguration(Configuration.GIT_COMMIT_PENALTY, Float.class);
-        if (current.equals(gitCommitPenalty)) { return; }
+        T current = dao.getConfiguration(configKey, type);
+        if (current.equals(value)) return;
 
-        dao.setConfiguration(Configuration.GIT_COMMIT_PENALTY, gitCommitPenalty, Float.class);
-        logConfigChange("set the git commit penalty to %s".formatted(gitCommitPenalty), user.netId());
+        dao.setConfiguration(configKey, value, type);
+        logConfigChange("changed %s to %s".formatted(configKey.name(), value.toString()), admin.netId());
     }
 }

From 3d5a694dd7e1022a27670ca9cd9b39dd98c68257 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:32:35 -0700
Subject: [PATCH 11/17] connect clock forgiveness and lines per commit to
 backend

---
 .../components/config/PenaltyConfigEditor.vue | 23 ++++++++++++-------
 .../frontend/src/services/configService.ts    |  8 ++++++-
 .../frontend/src/stores/appConfig.ts          | 16 +++++++++----
 .../src/views/AdminView/ConfigView.vue        |  5 +++-
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
index 5d347513..e766d0e2 100644
--- a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -9,19 +9,28 @@ const { closeEditor } = defineProps<{
 
 const appConfig = useAppConfigStore();
 
-const gitPenalty = ref<number>(Math.round(appConfig.gitCommitPenalty * 100))
 const latePenalty = ref<number>(Math.round(appConfig.perDayLatePenalty * 100))
 const maxLateDays = ref<number>(appConfig.maxLateDaysPenalized)
+const gitPenalty = ref<number>(Math.round(appConfig.gitCommitPenalty * 100))
+const linesChangedPerCommit = ref<number>(appConfig.linesChangedPerCommit)
+const clockForgivenessMinutes = ref<number>(appConfig.clockForgivenessMinutes)
 
 const valuesReady = () => {
   return (gitPenalty.value >= 0) && (gitPenalty.value <= 100)
     && (latePenalty.value >= 0) && (latePenalty.value <= 100)
     && (maxLateDays.value >= 0)
+    && (linesChangedPerCommit.value >= 0)
+    && (clockForgivenessMinutes.value >= 0)
 }
 
 const submit = async () => {
   try {
-    await setPenalties(maxLateDays.value, gitPenalty.value / 100, latePenalty.value / 100)
+    await setPenalties(maxLateDays.value,
+      gitPenalty.value / 100,
+      latePenalty.value / 100,
+      linesChangedPerCommit.value,
+      clockForgivenessMinutes.value)
+
     closeEditor()
   } catch (e) {
     appConfig.updateConfig()
@@ -55,20 +64,18 @@ const submit = async () => {
     <div class="value">
       <p class="valueName">Lines Changed Per Commit</p>
       <p class="valueDescription">The minimum number of lines that must change for a commit to count.</p>
-      <p><input type="number" v-model="gitPenalty"/> lines</p>
+      <p><input type="number" v-model="linesChangedPerCommit"/> lines</p>
     </div>
     <div class="value">
-      <p class="valueName">Clock Variability</p>
+      <p class="valueName">Clock Forgiveness</p>
       <p class="valueDescription">The commit checker will block if commits are authored in the future.
         This value controls how far in the future a student's commit can be to account for differences in system time.</p>
-      <p><input type="number" v-model="gitPenalty"/> minutes</p>
+      <p><input type="number" v-model="clockForgivenessMinutes"/> minutes</p>
     </div>
   </div>
 
-
-
   <button :disabled="!valuesReady()" @click="submit">Submit</button>
-  <p v-if="!valuesReady()" style="max-width: 350px"><em>All values must be non-negative, and penalties must be equal to or less than 100%</em></p>
+  <p v-if="!valuesReady()" style="color: red"><em>All values must be non-negative, and penalties must be equal to or less than 100%</em></p>
   <p><em>None of these values affect admin submissions</em></p>
 </template>
 
diff --git a/src/main/resources/frontend/src/services/configService.ts b/src/main/resources/frontend/src/services/configService.ts
index 653c7206..8839476a 100644
--- a/src/main/resources/frontend/src/services/configService.ts
+++ b/src/main/resources/frontend/src/services/configService.ts
@@ -13,11 +13,17 @@ export const getConfig = async ():Promise<Config> => {
   return await ServerCommunicator.getRequest<Config>(endpoint)
 }
 
-export const setPenalties = async (maxLateDaysPenalized: number, gitCommitPenalty: number, perDayLatePenalty: number) => {
+export const setPenalties = async (maxLateDaysPenalized: number,
+                                   gitCommitPenalty: number,
+                                   perDayLatePenalty: number,
+                                   linesChangedPerCommit: number,
+                                   clockForgivenessMinutes: number) => {
   await doSetConfigItem("POST", '/api/admin/config/penalties', {
     maxLateDaysPenalized: maxLateDaysPenalized,
     gitCommitPenalty: gitCommitPenalty,
     perDayLatePenalty: perDayLatePenalty,
+    linesChangedPerCommit: linesChangedPerCommit,
+    clockForgivenessMinutes: clockForgivenessMinutes
   })
 }
 
diff --git a/src/main/resources/frontend/src/stores/appConfig.ts b/src/main/resources/frontend/src/stores/appConfig.ts
index 5750d3c9..dab2c4a9 100644
--- a/src/main/resources/frontend/src/stores/appConfig.ts
+++ b/src/main/resources/frontend/src/stores/appConfig.ts
@@ -13,9 +13,11 @@ export type Config = {
   bannerColor: string
   bannerExpiration: string
 
-  perDayLatePenalty: number,
-  gitCommitPenalty: number,
-  maxLateDaysPenalized: number,
+  perDayLatePenalty: number
+  gitCommitPenalty: number
+  maxLateDaysPenalized: number
+  linesChangedPerCommit: number
+  clockForgivenessMinutes: number
 
   phases: Array<Phase>
   courseNumber?: number
@@ -57,6 +59,8 @@ export const useAppConfigStore = defineStore('appConfig', () => {
     perDayLatePenalty.value = latestConfig.perDayLatePenalty
     gitCommitPenalty.value = latestConfig.gitCommitPenalty
     maxLateDaysPenalized.value = latestConfig.maxLateDaysPenalized
+    linesChangedPerCommit.value = latestConfig.linesChangedPerCommit
+    clockForgivenessMinutes.value = latestConfig.clockForgivenessMinutes
 
     for (const phase of listOfPhases() as Phase[]) {
       activePhaseList.value[phase] = latestConfig.phases.includes(phase);
@@ -81,6 +85,8 @@ export const useAppConfigStore = defineStore('appConfig', () => {
   const perDayLatePenalty = ref<number>(0)
   const gitCommitPenalty = ref<number>(0)
   const maxLateDaysPenalized = ref<number>(0)
+  const linesChangedPerCommit = ref<number>(0)
+  const clockForgivenessMinutes = ref<number>(0)
 
   // using the enum, if phaseActivationList[phase] == true, then that phase is active
   const activePhaseList: Ref<boolean[]> = ref<Array<boolean>>([]);
@@ -102,6 +108,8 @@ export const useAppConfigStore = defineStore('appConfig', () => {
     courseNumber,
     perDayLatePenalty,
     gitCommitPenalty,
-    maxLateDaysPenalized
+    maxLateDaysPenalized,
+    linesChangedPerCommit,
+    clockForgivenessMinutes
   };
 })
diff --git a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
index e0ef45f2..1630f82c 100644
--- a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
+++ b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
@@ -54,9 +54,12 @@ onMounted( async () => {
         <PenaltyConfigEditor :closeEditor="closeEditor"/>
       </template>
       <template #current>
-        <p><span class="infoLabel">Git Commit Penalty: </span>{{Math.round(appConfigStore.gitCommitPenalty * 100)}}%</p>
         <p><span class="infoLabel">Late Penalty: </span>{{Math.round(appConfigStore.perDayLatePenalty * 100)}}%</p>
         <p><span class="infoLabel">Max Days Penalized: </span>{{appConfigStore.maxLateDaysPenalized}} days</p>
+
+        <p><span class="infoLabel">Git Commit Penalty: </span>{{Math.round(appConfigStore.gitCommitPenalty * 100)}}%</p>
+        <p><span class="infoLabel">Lines Per Commit: </span>{{appConfigStore.linesChangedPerCommit }} lines</p>
+        <p><span class="infoLabel">Clock Forgiveness: </span>{{appConfigStore.clockForgivenessMinutes}} minutes</p>
       </template>
     </ConfigSection>
 

From 1eb1619fdd038f6daa1a6ecf7abc2abdb4b31e92 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:54:34 -0700
Subject: [PATCH 12/17] use config values in system

---
 src/main/java/edu/byu/cs/util/PhaseUtils.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/byu/cs/util/PhaseUtils.java b/src/main/java/edu/byu/cs/util/PhaseUtils.java
index 9c7f8879..af400511 100644
--- a/src/main/java/edu/byu/cs/util/PhaseUtils.java
+++ b/src/main/java/edu/byu/cs/util/PhaseUtils.java
@@ -169,14 +169,18 @@ public static float extraCreditValue(Phase phase) {
     }
 
     public static CommitVerificationConfig verificationConfig(Phase phase) throws GradingException {
-        int minimumLinesChanged = 5;
+        ConfigurationDao dao = DaoService.getConfigurationDao();
+        int minimumLinesChanged;
         int penaltyPct;
+        int forgivenessMinutesHead;
         try {
-            penaltyPct = Math.round(DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class) * 100);
+            penaltyPct = Math.round(dao.getConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, Float.class) * 100);
+            minimumLinesChanged = dao.getConfiguration(ConfigurationDao.Configuration.LINES_PER_COMMIT_REQUIRED, Integer.class);
+            forgivenessMinutesHead = dao.getConfiguration(ConfigurationDao.Configuration.CLOCK_FORGIVENESS_MINUTES, Integer.class);
         } catch (DataAccessException e) {
-            throw new GradingException("Error getting git commit penalty", e);
+            throw new GradingException("Error getting git commit config", e);
         }
-        int forgivenessMinutesHead = 3;
+
         return switch (phase) {
             case Phase0, Phase1 -> new CommitVerificationConfig(8, 2, minimumLinesChanged, penaltyPct, forgivenessMinutesHead);
             case Phase3, Phase4, Phase5, Phase6 -> new CommitVerificationConfig(12, 3, minimumLinesChanged, penaltyPct, forgivenessMinutesHead);

From 92343321a48f2f5449046eac8a41e6edb8c06927 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:01:37 -0700
Subject: [PATCH 13/17] rephrase Clock Forgiveness description

---
 .../frontend/src/components/config/PenaltyConfigEditor.vue     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
index e766d0e2..817a1ae9 100644
--- a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -68,8 +68,7 @@ const submit = async () => {
     </div>
     <div class="value">
       <p class="valueName">Clock Forgiveness</p>
-      <p class="valueDescription">The commit checker will block if commits are authored in the future.
-        This value controls how far in the future a student's commit can be to account for differences in system time.</p>
+      <p class="valueDescription">The number of minutes in the future we will tolerate local clock non-synchronization in Git Commit Verification.</p>
       <p><input type="number" v-model="clockForgivenessMinutes"/> minutes</p>
     </div>
   </div>

From d5630fc8323a36d4f4f42c78c4eee8ed72af1434 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Mon, 18 Nov 2024 14:22:23 -0700
Subject: [PATCH 14/17] add default values to ConfigMemoryDao

---
 src/main/java/edu/byu/cs/autograder/score/Scorer.java | 3 ++-
 src/main/java/edu/byu/cs/dataAccess/DaoService.java   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/byu/cs/autograder/score/Scorer.java b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
index 4389f1f4..296a64d8 100644
--- a/src/main/java/edu/byu/cs/autograder/score/Scorer.java
+++ b/src/main/java/edu/byu/cs/autograder/score/Scorer.java
@@ -40,7 +40,8 @@ public class Scorer {
     public Scorer(GradingContext gradingContext) {
         this.gradingContext = gradingContext;
         try {
-            PER_DAY_LATE_PENALTY = DaoService.getConfigurationDao().getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class);
+            ConfigurationDao dao = DaoService.getConfigurationDao();
+            PER_DAY_LATE_PENALTY = dao.getConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, Float.class);
         } catch (DataAccessException e) {
             LOGGER.error("Error while getting Per Day Late Penalty for Scorer.");
             throw new RuntimeException(e);
diff --git a/src/main/java/edu/byu/cs/dataAccess/DaoService.java b/src/main/java/edu/byu/cs/dataAccess/DaoService.java
index 47a8a94f..815017b3 100644
--- a/src/main/java/edu/byu/cs/dataAccess/DaoService.java
+++ b/src/main/java/edu/byu/cs/dataAccess/DaoService.java
@@ -50,6 +50,13 @@ public static void setRubricConfigDao(RubricConfigDao rubricConfigDao) {
 
     public static void setConfigurationDao(ConfigurationDao configurationDao) {
         DaoService.configurationDao = configurationDao;
+        try {
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, 0.1f, Float.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, 5, Integer.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, 0.1f, Float.class);
+        } catch (DataAccessException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public static void setRepoUpdateDao(RepoUpdateDao repoUpdateDao) {

From b30a8900a1795d59536c3423c848ee83106934f7 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Mon, 18 Nov 2024 14:41:11 -0700
Subject: [PATCH 15/17] initial memory config dao in correct place

---
 .../java/edu/byu/cs/dataAccess/DaoService.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/byu/cs/dataAccess/DaoService.java b/src/main/java/edu/byu/cs/dataAccess/DaoService.java
index 815017b3..8723cad7 100644
--- a/src/main/java/edu/byu/cs/dataAccess/DaoService.java
+++ b/src/main/java/edu/byu/cs/dataAccess/DaoService.java
@@ -50,13 +50,6 @@ public static void setRubricConfigDao(RubricConfigDao rubricConfigDao) {
 
     public static void setConfigurationDao(ConfigurationDao configurationDao) {
         DaoService.configurationDao = configurationDao;
-        try {
-            configurationDao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, 0.1f, Float.class);
-            configurationDao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, 5, Integer.class);
-            configurationDao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, 0.1f, Float.class);
-        } catch (DataAccessException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     public static void setRepoUpdateDao(RepoUpdateDao repoUpdateDao) {
@@ -73,6 +66,17 @@ public static void initializeMemoryDAOs() {
         DaoService.setSubmissionDao(new SubmissionMemoryDao());
         DaoService.setConfigurationDao(new ConfigurationMemoryDao());
         DaoService.setRepoUpdateDao(new RepoUpdateMemoryDao());
+
+        /* Initialize crucial default values in Config for testing purposes */
+        try {
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.GIT_COMMIT_PENALTY, 0.1f, Float.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.MAX_LATE_DAYS_TO_PENALIZE, 5, Integer.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.PER_DAY_LATE_PENALTY, 0.1f, Float.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.LINES_PER_COMMIT_REQUIRED, 5, Integer.class);
+            configurationDao.setConfiguration(ConfigurationDao.Configuration.CLOCK_FORGIVENESS_MINUTES, 3, Integer.class);
+        } catch (DataAccessException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public static void initializeSqlDAOs() throws DataAccessException {

From 6179ca30a60c133f7844e6e624201ff5e46a0272 Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Mon, 18 Nov 2024 14:45:07 -0700
Subject: [PATCH 16/17] fix aesthetic bug on Banner Message Config

---
 .../resources/frontend/src/views/AdminView/ConfigView.vue  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
index e2bf05d9..d7b6747a 100644
--- a/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
+++ b/src/main/resources/frontend/src/views/AdminView/ConfigView.vue
@@ -28,8 +28,11 @@ onMounted( async () => {
       </template>
       <template #current>
       <div v-if="appConfigStore.bannerMessage">
-        <p><span class="infoLabel">Current Message: </span><span v-text="appConfigStore.bannerMessage"/></p>
-        <p><span class="infoLabel">Current Link: </span><span v-html="generateClickableLink(appConfigStore.bannerLink)"/></p>
+        <p><span class="infoLabel">Message: </span><span v-text="appConfigStore.bannerMessage"/></p>
+        <p><span class="infoLabel">Link: </span>
+          <span v-if="appConfigStore.bannerLink" v-html="generateClickableLink(appConfigStore.bannerLink)"/>
+          <span v-else>none</span>
+        </p>
         <p><span class="infoLabel">Expires: </span><span v-text="readableTimestamp(appConfigStore.bannerExpiration)"/></p>
       </div>
         <p v-else>There is currently no banner message</p>

From 9bedd83757986edbcec0f1afeea0bf5383830bce Mon Sep 17 00:00:00 2001
From: DallinFromEarth <112426674+DallinFromEarth@users.noreply.github.com>
Date: Mon, 18 Nov 2024 14:53:56 -0700
Subject: [PATCH 17/17] clarify git commit penalty description

---
 .../frontend/src/components/config/PenaltyConfigEditor.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
index 817a1ae9..20cbfa95 100644
--- a/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
+++ b/src/main/resources/frontend/src/components/config/PenaltyConfigEditor.vue
@@ -43,12 +43,12 @@ const submit = async () => {
   <div class="penalty">
     <div class="value">
       <p class="valueName">Late Penalty</p>
-      <p class="valueDescription">Applied per day the submission is late</p>
+      <p class="valueDescription">Applied per day the submission is late.</p>
       <p><input type="number" v-model="latePenalty"/>%</p>
     </div>
     <div class="value">
       <p class="valueName">Max Late Days</p>
-      <p class="valueDescription">Days after which the late penalty caps out</p>
+      <p class="valueDescription">Days after which the late penalty caps out.</p>
       <p><input type="number" v-model="maxLateDays"/> days</p>
     </div>
   </div>
@@ -58,7 +58,7 @@ const submit = async () => {
   <div class="penalty">
     <div class="value">
       <p class="valueName">Git Commit Penalty</p>
-      <p class="valueDescription">Applied when students don't have enough commits</p>
+      <p class="valueDescription">Applied when students don't have enough commits and a TA determines they should receive a penalty.</p>
       <p><input type="number" v-model="gitPenalty"/>%</p>
     </div>
     <div class="value">