From e9f9d3d0d147a1ec1bf5139435d2392ed8d4c4e2 Mon Sep 17 00:00:00 2001
From: Ajay Gandecha <ajgandecha@gmail.com>
Date: Mon, 11 Nov 2024 16:05:23 -0500
Subject: [PATCH] Add Application Date Start / End Editor for Terms (#644)

* Prepare TA Applications for Spring 2025

* Fix Another Date Field

* Add Application Start / End Editing
---
 backend/services/academics/term.py            |  2 ++
 .../term-editor/term-editor.component.html    | 24 +++++++++++++++++++
 .../term/term-editor/term-editor.component.ts | 16 +++++++++++--
 .../src/app/academics/academics.models.ts     |  2 ++
 .../src/app/academics/academics.resolver.ts   |  2 ++
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/backend/services/academics/term.py b/backend/services/academics/term.py
index 4330c85d3..43bcfed99 100644
--- a/backend/services/academics/term.py
+++ b/backend/services/academics/term.py
@@ -142,6 +142,8 @@ def update(self, subject: User, term: Term) -> TermDetails:
         term_entity.name = term.name
         term_entity.start = term.start
         term_entity.end = term.end
+        term_entity.applications_open = term.applications_open
+        term_entity.applications_close = term.applications_close
 
         # Commit changes
         self._session.commit()
diff --git a/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.html b/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.html
index 7d4a55a82..02fc48f0d 100644
--- a/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.html
+++ b/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.html
@@ -36,6 +36,7 @@
       </mat-form-field>
       <!-- Term Start Field -->
       <mat-form-field appearance="outline" color="accent">
+        <mat-label>Term Start Date</mat-label>
         <input
           matInput
           type="datetime-local"
@@ -46,6 +47,7 @@
       </mat-form-field>
       <!-- Term End Field -->
       <mat-form-field appearance="outline" color="accent">
+        <mat-label>Term End Date</mat-label>
         <input
           matInput
           type="datetime-local"
@@ -54,6 +56,28 @@
           name="end"
           required />
       </mat-form-field>
+      <!-- Term Applications Open Field -->
+      <mat-form-field appearance="outline" color="accent">
+        <mat-label>Term Applications Open Date</mat-label>
+        <input
+          matInput
+          type="datetime-local"
+          placeholder="Start Date"
+          formControlName="applications_open"
+          name="applications_open"
+          required />
+      </mat-form-field>
+      <!-- Term Applications Close Field -->
+      <mat-form-field appearance="outline" color="accent">
+        <mat-label>Term Applications Close Date</mat-label>
+        <input
+          matInput
+          type="datetime-local"
+          placeholder="End Date"
+          formControlName="applications_close"
+          name="applications_close"
+          required />
+      </mat-form-field>
     </mat-card-content>
     <mat-card-actions>
       <button mat-stroked-button routerLink="/academics/admin/term">
diff --git a/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.ts b/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.ts
index 416614b02..5ddf4a796 100644
--- a/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.ts
+++ b/frontend/src/app/academics/academics-admin/term/term-editor/term-editor.component.ts
@@ -75,13 +75,17 @@ export class TermEditorComponent {
   name = new FormControl('', [Validators.required]);
   start = new FormControl('', [Validators.required]);
   end = new FormControl('', [Validators.required]);
+  applications_open = new FormControl('', [Validators.required]);
+  applications_close = new FormControl('', [Validators.required]);
 
   /** Term Editor Form */
   public termForm = this.formBuilder.group({
     id: this.id,
     name: this.name,
     start: this.start,
-    end: this.end
+    end: this.end,
+    applications_open: this.applications_open,
+    applications_close: this.applications_close
   });
 
   /** Constructs the term editor component */
@@ -111,7 +115,15 @@ export class TermEditorComponent {
       id: this.termId == 'new' ? '' : this.term.id,
       name: this.term.name,
       start: this.datePipe.transform(this.term.start, 'yyyy-MM-ddTHH:mm'),
-      end: this.datePipe.transform(this.term.end, 'yyyy-MM-ddTHH:mm')
+      end: this.datePipe.transform(this.term.end, 'yyyy-MM-ddTHH:mm'),
+      applications_open: this.datePipe.transform(
+        this.term.applications_open,
+        'yyyy-MM-ddTHH:mm'
+      ),
+      applications_close: this.datePipe.transform(
+        this.term.applications_close,
+        'yyyy-MM-ddTHH:mm'
+      )
     });
   }
 
diff --git a/frontend/src/app/academics/academics.models.ts b/frontend/src/app/academics/academics.models.ts
index e8774f772..abaecb4a1 100644
--- a/frontend/src/app/academics/academics.models.ts
+++ b/frontend/src/app/academics/academics.models.ts
@@ -73,6 +73,8 @@ export interface EditedSection {
 export interface Term extends TimeRange {
   id: string;
   name: string;
+  applications_open: Date;
+  applications_close: Date;
 }
 
 /** Defines a Section Member */
diff --git a/frontend/src/app/academics/academics.resolver.ts b/frontend/src/app/academics/academics.resolver.ts
index 583f71806..274790f3e 100644
--- a/frontend/src/app/academics/academics.resolver.ts
+++ b/frontend/src/app/academics/academics.resolver.ts
@@ -80,6 +80,8 @@ export const termResolver: ResolveFn<Term | undefined> = (route, state) => {
       name: '',
       start: new Date(),
       end: new Date(),
+      applications_open: new Date(),
+      applications_close: new Date(),
       course_sections: null
     };
   }