From 08bf763c19e4fa303c62509fac8371f236c31a53 Mon Sep 17 00:00:00 2001
From: Gavriel R-H <gavriel@gavrielrh.com>
Date: Wed, 22 Jan 2020 21:28:40 -0500
Subject: [PATCH 1/3] Add a default end date for memberships based on the
 semester.

---
 app/js/scoreboard/components/AddMembershipModal.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/js/scoreboard/components/AddMembershipModal.jsx b/app/js/scoreboard/components/AddMembershipModal.jsx
index 48bf020f..22243969 100644
--- a/app/js/scoreboard/components/AddMembershipModal.jsx
+++ b/app/js/scoreboard/components/AddMembershipModal.jsx
@@ -32,6 +32,11 @@ class AddMembershipModal extends Component {
 
     const committeeNames = committees.map(committee => committee.name);
     const dayFormat = 'YYYY-MM-DD';
+    // First day to withdraw classes: Sept 4th or January 21st
+    // Amend these dates as necessary
+    const janDate = moment({ months: 0, day: 22 });
+    const septDate = moment({ months: 8, day: 4 });
+    const endDate = moment().isAfter(janDate) ? septDate : janDate;
 
     return (
       <Modal isOpen={isOpen} toggle={close}>
@@ -39,7 +44,7 @@ class AddMembershipModal extends Component {
         <UserForm
           initialValues={{
             startDate: moment().format(dayFormat),
-            endDate: '',
+            endDate: endDate.format(dayFormat),
             reason: '',
             committeeName: initialCommitteeName,
           }}

From 11744f9b2fc07817eeb759d30d6f7cd4d1d8bfb2 Mon Sep 17 00:00:00 2001
From: Gavriel R-H <gavriel@gavrielrh.com>
Date: Wed, 22 Jan 2020 21:54:29 -0500
Subject: [PATCH 2/3] Handle next years january as enddate for membership

---
 app/js/scoreboard/components/AddMembershipModal.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/js/scoreboard/components/AddMembershipModal.jsx b/app/js/scoreboard/components/AddMembershipModal.jsx
index 22243969..02f7dc0a 100644
--- a/app/js/scoreboard/components/AddMembershipModal.jsx
+++ b/app/js/scoreboard/components/AddMembershipModal.jsx
@@ -32,11 +32,11 @@ class AddMembershipModal extends Component {
 
     const committeeNames = committees.map(committee => committee.name);
     const dayFormat = 'YYYY-MM-DD';
-    // First day to withdraw classes: Sept 4th or January 21st
+    // First day to withdraw classes: Sept 4th or January 22st
     // Amend these dates as necessary
-    const janDate = moment({ months: 0, day: 22 });
+    const janDate = moment({ months: 0, day: 22 }).add({ years: 1 });
     const septDate = moment({ months: 8, day: 4 });
-    const endDate = moment().isAfter(janDate) ? septDate : janDate;
+    const endDate = moment().month() < 8 ? septDate : janDate;
 
     return (
       <Modal isOpen={isOpen} toggle={close}>

From 7d01093c088b2a503c4cf3c160e4bb72201b8ffd Mon Sep 17 00:00:00 2001
From: Gavriel R-H <gavriel@gavrielrh.com>
Date: Wed, 22 Jan 2020 22:03:48 -0500
Subject: [PATCH 3/3] Clarify the dates for withdrawals and how they correspond
 to memberships

---
 app/js/scoreboard/components/AddMembershipModal.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/js/scoreboard/components/AddMembershipModal.jsx b/app/js/scoreboard/components/AddMembershipModal.jsx
index 02f7dc0a..00fadcd4 100644
--- a/app/js/scoreboard/components/AddMembershipModal.jsx
+++ b/app/js/scoreboard/components/AddMembershipModal.jsx
@@ -32,11 +32,11 @@ class AddMembershipModal extends Component {
 
     const committeeNames = committees.map(committee => committee.name);
     const dayFormat = 'YYYY-MM-DD';
-    // First day to withdraw classes: Sept 4th or January 22st
+    // Memberships carry over to the first withdrawal date of the following semester
     // Amend these dates as necessary
-    const janDate = moment({ months: 0, day: 22 }).add({ years: 1 });
-    const septDate = moment({ months: 8, day: 4 });
-    const endDate = moment().month() < 8 ? septDate : janDate;
+    const springWithdrawalDate = moment({ months: 0, day: 22 }).add({ years: 1 });
+    const fallWithdrawalDate = moment({ months: 8, day: 4 });
+    const endDate = moment().month() < fallWithdrawalDate.month() ? fallWithdrawalDate : springWithdrawalDate;
 
     return (
       <Modal isOpen={isOpen} toggle={close}>