From 34b93d56ad89065dd860c901efd2ecef58d8fe80 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Tue, 18 Jun 2024 18:07:41 +0000
Subject: [PATCH 01/16] testing for UI CE Minor

---
 app/templates/minor/profile.html | 123 ++++++++++++++++++++++++++++---
 1 file changed, 113 insertions(+), 10 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index b727e2105..35a781b15 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -1,29 +1,48 @@
 {%set title = "Student Minor Page"%}
 {% extends "base.html" %}
-
 {% block scripts %}
   {{super()}}
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
   <script type="text/javascript" src="{{url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{lastStaticUpdate}}"></script>
 {% endblock %}
-
 {% block styles %}
   {{super()}}
   <link rel="stylesheet" href="{{url_for('static', filename ='css/minor.css') }}?u={{lastStaticUpdate}}">
   {% endblock %}
-
 {% block app_content %}
     <div class="row">
       <input id="username" value="{{user.username}}" hidden/>
       <div name="Header" class="row">
           <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h2>
       </div>
-      <div name="Sustained Community Engagement Section">
+      <div class="row">
+        <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">
+        <li class="col-md-3 col-12 nav-item" role="presentation">
+          <button class="nav-link {{'active' if activeTab == 'studentLedEvents' else ''}}" id="studentLedEvents"
+          data-bs-toggle="pill" data-bs-target="#pills-student-led" type="button" role="tab" aria-controls="pills-student-led" aria-selected="true">Sustained Community Engagements</button>
+        </li>
+        <li class="col-md-3 col-12 nav-item" role="presentation">
+          <button class="nav-link" id="trainingEvents"
+          data-bs-toggle="pill" data-bs-target="#pills-training" type="button" role="tab" aria-controls="pills-training" aria-selected="false">Summer Experience</button>
+        </li>
+        {% if user.isCeltsAdmin or user.isCeltsStudentStaff or user.isBonnerScholar %}
+          <li class="col-md-3 col-12 nav-item" role="presentation">
+            <button class="nav-link {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="bonnerScholarsEvents"
+            data-bs-toggle="pill" data-bs-target="#pills-bonner-scholars" type="button" role="tab" aria-controls="pills-bonner-scholars" aria-selected="false">Requesting Other Engagement</button>
+          </li>
+          {% endif %}
+        <!--<li class="col-md-3 col-12 nav-item" role="presentation">
+          <button class="nav-link {{'active' if activeTab == 'otherEvents' else ''}}" id="otherEvents"
+          data-bs-toggle="pill" data-bs-target="#pills-one-time" type="button" role="tab" aria-controls="pills-one-time" aria-selected="false">Other Events</button>
+        </li>
+        </ul>
+      </div>
+      <!-- <div name="Sustained Community Engagement Section">
         <div class="row">
           <h3 class="col-md-auto {% if totalSustainedEngagements >= 4 %}bi bi-check2 {% endif %}">Sustained Community Engagement</h3>&nbsp
-          <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{user.username}}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>              
-        </div>
-        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
+          <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{user.username}}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
+        </div> -->
+        <!-- <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
         <div class="accordion" id="communityEngagement">
           {% if sustainedEngagementByTerm %}
             {% for term, engagements in sustainedEngagementByTerm.items() %}
@@ -68,9 +87,9 @@ <h3 class="accordion-header" id="headingOne">
             {% else %}
               <h2>You have not participated in any service learning events or courses.</h2>
             {% endif %}
-          </div>
+             -->
+          <!-- </div>
         </div>
-
         <div name="Community-Engaged Summer Experience" class="pt-4">
           <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
           <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
@@ -87,6 +106,90 @@ <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Commun
             </div>
           </div>
         </div>
-    </div>
+    </div> -->
+    <div class="tab-content" id="pills-tabContent">
+      <div class="tab-pane fade show {{'active' if activeTab == 'studentLedEvents' else ''}}" id="pills-student-led" role="tabpanel" aria-labelledby="pills-student-led-tab">
+        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
+        <div class="accordion" id="communityEngagement">
+          {% if sustainedEngagementByTerm %}
+            {% for term, engagements in sustainedEngagementByTerm.items() %}
+            <div class="accordion-item">
+              <h3 class="accordion-header" id="headingOne">
+                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{loop.index}}" aria-expanded="true" aria-controls="collapse{{loop.index}}">
+                  {{term[0]}}
+                </button>
+                </h3>
+                <div id="collapse{{loop.index}}" class="accordion-collapse collapse" aria-labelledby="heading{{loop.index}}"+  data-bs-parent="#communityEngagement">
+                  <div class="accordion-body">
+                    <div class="container-fluid col-10">
+                      <div class="row d-flex justify-content-center mb-3">
+                        <div class="col-md-6 mb-3">
+                          <table class="table mb-3">
+                            <thead>
+                              <tr>
+                                <th scope="col">Community Engagement Activity</th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              {% for engagement in engagements %}
+                              <tr class="engagement-row" data-engagement-data='{{engagement|tojson}}'>
+                                <td>
+                                  <input type="checkbox" {{'checked' if engagement['matched'] else ''}} />
+                                  <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
+                                </td>
+                              </tr>
+                              {% endfor %}
+                            </tbody>
+                          </table>
+                        </div>
+                        <div class="col-md-6 p-3" id="set{{term[1]}}">
+                          Click on an engagement entry to see your event history or course information.
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              {% endfor %}
+            {% else %}
+              <h2>You have not participated in any service learning events or courses.</h2>
+            {% endif %}
+          </div>
+                
+        </button>
+              </div>
+            <div class="tab-content" id="pills-tabContent">
+             <div class="tab-pane fade show {{'active' if activeTab == 'trainingEvents' else ''}}" id="pills-training" role="tabpanel" aria-labelledby="pills-training-tab">
+              <div name="Community-Engaged Summer Experience" class="pt-4">
+                <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
+                <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
+                <div class="row-auto col-md-6">
+                  <div class="input-group">
+                    <select class="form-select" name='term' id='summerExperienceTerm' required>
+                      {% for term in summerTerms %}
+                        <option value="{{selectedSummerTerm}}" {{"selected" if term.description == selectedSummerTerm}}>{{term.description}}</option>
+                      {% endfor %}
+                    </select>
+                    <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{summerExperience}}' type="text"/>
+                    <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
+                    <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>
+                  </div>
+                </div>
+              </div>
+            </button>
+          </div>
+          <div class="tab-content" id="pills-tabContent">
+            <div class="tab-pane fade show {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="pills-bonner-scholars-tab">
+                <div name="Community-Engaged Summer Experience" class="pt-4">
+            <!-- <li class="col-md-3 col-12 nav-item" role="presentation">
+                <button class="nav-link {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="bonnerScholarsEvents"
+                data-bs-toggle="pill" data-bs-target="#pills-bonner-scholars" type="button" role="tab" aria-controls="pills-bonner-scholars" aria-selected="false">Requesting Other Engagement</button> -->
+              </li>
+              <div name="Sustained Community Engagement Section">
+                <div class="row">
+                  <!-- <h3 class="col-md-auto {% if totalSustainedEngagements >= 4 %}bi bi-check2 {% endif %}">Sustained Community Engagement</h3>&nbsp --> 
+                  <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{user.username}}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
+                  </div>
 {% endblock %}
 
+

From 3067b1aa92d900c3842ba180b339efcc9e2ce142 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Thu, 20 Jun 2024 15:16:08 +0000
Subject: [PATCH 02/16] Final Update

---
 app/templates/minor/profile.html | 234 ++++++++++---------------------
 1 file changed, 75 insertions(+), 159 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 35a781b15..394318bcf 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -3,93 +3,86 @@
 {% block scripts %}
   {{super()}}
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
-  <script type="text/javascript" src="{{url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{lastStaticUpdate}}"></script>
+  <script type="text/javascript" src="{{url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate}}"></script>
 {% endblock %}
 {% block styles %}
   {{super()}}
-  <link rel="stylesheet" href="{{url_for('static', filename ='css/minor.css') }}?u={{lastStaticUpdate}}">
-  {% endblock %}
+  <link rel="styl esheet" href="{{url_for('static', filename='css/minor.css') }}?u={{ lastStaticUpdate}}">
+{% endblock %}
 {% block app_content %}
+  <div class="row">
+    <input id="username" value="{{user.username}}" hidden/>
+    <div name="Header" class="row">
+      <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h1>
+    </div>
     <div class="row">
-      <input id="username" value="{{user.username}}" hidden/>
-      <div name="Header" class="row">
-          <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h2>
-      </div>
-      <div class="row">
-        <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">
+      <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">
         <li class="col-md-3 col-12 nav-item" role="presentation">
-          <button class="nav-link {{'active' if activeTab == 'studentLedEvents' else ''}}" id="studentLedEvents"
-          data-bs-toggle="pill" data-bs-target="#pills-student-led" type="button" role="tab" aria-controls="pills-student-led" aria-selected="true">Sustained Community Engagements</button>
+          <button class="nav-link {{ 'active' if activeTab == 'studentLedEvents' else '' }}" id="studentLedEvents"
+            data-bs-toggle="pill" data-bs-target="#pills-student-led" type="button" role="tab" aria-controls="pills-student-led" aria-selected="true">Sustained Community Engagements</button>
         </li>
         <li class="col-md-3 col-12 nav-item" role="presentation">
-          <button class="nav-link" id="trainingEvents"
-          data-bs-toggle="pill" data-bs-target="#pills-training" type="button" role="tab" aria-controls="pills-training" aria-selected="false">Summer Experience</button>
+          <button class="nav-link {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="trainingEvents"
+            data-bs-toggle="pill" data-bs-target="#pills-training" type="button" role="tab" aria-controls="pills-training" aria-selected="false">Summer Experience</button>
         </li>
         {% if user.isCeltsAdmin or user.isCeltsStudentStaff or user.isBonnerScholar %}
-          <li class="col-md-3 col-12 nav-item" role="presentation">
-            <button class="nav-link {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="bonnerScholarsEvents"
+        <li class="col-md-3 col-12 nav-item" role="presentation">
+          <button class="nav-link {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="bonnerScholarsEvents"
             data-bs-toggle="pill" data-bs-target="#pills-bonner-scholars" type="button" role="tab" aria-controls="pills-bonner-scholars" aria-selected="false">Requesting Other Engagement</button>
-          </li>
-          {% endif %}
-        <!--<li class="col-md-3 col-12 nav-item" role="presentation">
-          <button class="nav-link {{'active' if activeTab == 'otherEvents' else ''}}" id="otherEvents"
-          data-bs-toggle="pill" data-bs-target="#pills-one-time" type="button" role="tab" aria-controls="pills-one-time" aria-selected="false">Other Events</button>
         </li>
-        </ul>
-      </div>
-      <!-- <div name="Sustained Community Engagement Section">
-        <div class="row">
-          <h3 class="col-md-auto {% if totalSustainedEngagements >= 4 %}bi bi-check2 {% endif %}">Sustained Community Engagement</h3>&nbsp
-          <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{user.username}}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
-        </div> -->
-        <!-- <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
+        {% endif %}
+      </ul>
+    </div>
+    <div class="tab-content" id="pills-tabContent">
+      <div class="tab-pane fade show {{ 'active' if activeTab == 'studentLedEvents' else '' }}" id="pills-student-led" role="tabpanel" aria-labelledby="pills-student-led-tab">
+        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagementactivities can be credited in a single semester.</p>
         <div class="accordion" id="communityEngagement">
           {% if sustainedEngagementByTerm %}
-            {% for term, engagements in sustainedEngagementByTerm.items() %}
-            <div class="accordion-item">
-              <h3 class="accordion-header" id="headingOne">
-                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{loop.index}}" aria-expanded="true" aria-controls="collapse{{loop.index}}">
-                  {{term[0]}}
-                </button>
-                </h3>
-                <div id="collapse{{loop.index}}" class="accordion-collapse collapse" aria-labelledby="heading{{loop.index}}"+  data-bs-parent="#communityEngagement">
-                  <div class="accordion-body">
-                    <div class="container-fluid col-10">
-                      <div class="row d-flex justify-content-center mb-3">
-                        <div class="col-md-6 mb-3">
-                          <table class="table mb-3">
-                            <thead>
-                              <tr>
-                                <th scope="col">Community Engagement Activity</th>
-                              </tr>
-                            </thead>
-                            <tbody>
-                              {% for engagement in engagements %}
-                              <tr class="engagement-row" data-engagement-data='{{engagement|tojson}}'>
-                                <td>
-                                  <input type="checkbox" {{'checked' if engagement['matched'] else ''}} />
-                                  <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
-                                </td>
-                              </tr>
-                              {% endfor %}
-                            </tbody>
-                          </table>
-                        </div>
-                        <div class="col-md-6 p-3" id="set{{term[1]}}">
-                          Click on an engagement entry to see your event history or course information.
-                        </div>
-                      </div>
+          {% for term, engagements in sustainedEngagementByTerm.items() %}
+          <div class="accordion-item">
+            <h3 class="accordion-header" id="headingOne">
+              <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{loop.index}}" aria-expanded="true" aria-controls="collapse{{loop.index}}">
+                {{term[0]}}
+              </button>
+            </h3>
+            <div id="collapse{{loop.index}}" class="accordion-collapse collapse" aria-labelledby="heading{{loop.index}}" data-bs-parent="#communityEngagement">
+              <div class="accordion-body">
+                <div class="container-fluid col-10">
+                  <div class="row d-flex justify-content-center mb-3">
+                    <div class="col-md-6 mb-3">
+                      <table class="table mb-3">
+                        <thead>
+                          <tr>
+                            <th scope="col">Community Engagement Activity</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          {% for engagement in engagements %}
+                          <tr class="engagement-row" data-engagement-data='{{engagement|tojson}}'>
+                            <td>
+                              <input type="checkbox" {{ 'checked' if engagement['matched'] else '' }} />
+                              <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
+                            </td>
+                          </tr>
+                          {% endfor %}
+                        </tbody>
+                      </table>
+                    </div>
+                    <div class="col-md-6 p-3" id="set{{term[1]}}">
+                      Click on an engagement entry to see your event history or course information.
                     </div>
                   </div>
                 </div>
               </div>
-              {% endfor %}
-            {% else %}
-              <h2>You have not participated in any service learning events or courses.</h2>
-            {% endif %}
-             -->
-          <!-- </div>
+            </div>
+          </div>
+          {% endfor %}
+          {% else %}
+          <h2>You have not participated in any service learning events or courses.</h2>
+          {% endif %}
         </div>
+      </div>
+      <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="pills-training-tab">
         <div name="Community-Engaged Summer Experience" class="pt-4">
           <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
           <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
@@ -97,99 +90,22 @@ <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Commun
             <div class="input-group">
               <select class="form-select" name='term' id='summerExperienceTerm' required>
                 {% for term in summerTerms %}
-                  <option value="{{selectedSummerTerm}}" {{"selected" if term.description == selectedSummerTerm}}>{{term.description}}</option>
+                <option value="{{ term.description }}" {{ "selected" if term.description == selectedSummerTerm }}>{{term.description}}</option>
                 {% endfor %}
               </select>
-              <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{summerExperience}}' type="text"/>
+              <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{ summerExperience }}' type="text" />
               <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
-              <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>
-            </div>
-          </div>
-        </div>
-    </div> -->
-    <div class="tab-content" id="pills-tabContent">
-      <div class="tab-pane fade show {{'active' if activeTab == 'studentLedEvents' else ''}}" id="pills-student-led" role="tabpanel" aria-labelledby="pills-student-led-tab">
-        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
-        <div class="accordion" id="communityEngagement">
-          {% if sustainedEngagementByTerm %}
-            {% for term, engagements in sustainedEngagementByTerm.items() %}
-            <div class="accordion-item">
-              <h3 class="accordion-header" id="headingOne">
-                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{loop.index}}" aria-expanded="true" aria-controls="collapse{{loop.index}}">
-                  {{term[0]}}
-                </button>
-                </h3>
-                <div id="collapse{{loop.index}}" class="accordion-collapse collapse" aria-labelledby="heading{{loop.index}}"+  data-bs-parent="#communityEngagement">
-                  <div class="accordion-body">
-                    <div class="container-fluid col-10">
-                      <div class="row d-flex justify-content-center mb-3">
-                        <div class="col-md-6 mb-3">
-                          <table class="table mb-3">
-                            <thead>
-                              <tr>
-                                <th scope="col">Community Engagement Activity</th>
-                              </tr>
-                            </thead>
-                            <tbody>
-                              {% for engagement in engagements %}
-                              <tr class="engagement-row" data-engagement-data='{{engagement|tojson}}'>
-                                <td>
-                                  <input type="checkbox" {{'checked' if engagement['matched'] else ''}} />
-                                  <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
-                                </td>
-                              </tr>
-                              {% endfor %}
-                            </tbody>
-                          </table>
-                        </div>
-                        <div class="col-md-6 p-3" id="set{{term[1]}}">
-                          Click on an engagement entry to see your event history or course information.
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              {% endfor %}
-            {% else %}
-              <h2>You have not participated in any service learning events or courses.</h2>
-            {% endif %}
+              <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>    
+         <div class="left-align">      
+          <p class="pt-2">If you would like to download the Proposal for Community-Engaged Summer Experience, click <a href="/static/files/serviceLearningProposalForm/CCEminorForm1online.docx">here</a>.</p>
           </div>
-                
-        </button>
-              </div>
-            <div class="tab-content" id="pills-tabContent">
-             <div class="tab-pane fade show {{'active' if activeTab == 'trainingEvents' else ''}}" id="pills-training" role="tabpanel" aria-labelledby="pills-training-tab">
-              <div name="Community-Engaged Summer Experience" class="pt-4">
-                <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
-                <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
-                <div class="row-auto col-md-6">
-                  <div class="input-group">
-                    <select class="form-select" name='term' id='summerExperienceTerm' required>
-                      {% for term in summerTerms %}
-                        <option value="{{selectedSummerTerm}}" {{"selected" if term.description == selectedSummerTerm}}>{{term.description}}</option>
-                      {% endfor %}
-                    </select>
-                    <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{summerExperience}}' type="text"/>
-                    <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
-                    <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>
-                  </div>
-                </div>
-              </div>
-            </button>
+            </div>
+           </div>
           </div>
-          <div class="tab-content" id="pills-tabContent">
-            <div class="tab-pane fade show {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="pills-bonner-scholars-tab">
-                <div name="Community-Engaged Summer Experience" class="pt-4">
-            <!-- <li class="col-md-3 col-12 nav-item" role="presentation">
-                <button class="nav-link {{'active' if activeTab == 'bonnerScholarsEvents' else ''}}" id="bonnerScholarsEvents"
-                data-bs-toggle="pill" data-bs-target="#pills-bonner-scholars" type="button" role="tab" aria-controls="pills-bonner-scholars" aria-selected="false">Requesting Other Engagement</button> -->
-              </li>
-              <div name="Sustained Community Engagement Section">
-                <div class="row">
-                  <!-- <h3 class="col-md-auto {% if totalSustainedEngagements >= 4 %}bi bi-check2 {% endif %}">Sustained Community Engagement</h3>&nbsp --> 
-                  <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{user.username}}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
-                  </div>
-{% endblock %}
-
-
+      </div>
+      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars"role="tabpanel" aria-labelledby="pills-bonner-scholars-tab">
+        <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{ user.username }}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
+      </div>
+    </div>
+  </div>
+  {% endblock %}
\ No newline at end of file

From 0263d7e31c2015ca13f0fe750337e6aaace0390f Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Thu, 20 Jun 2024 18:31:44 +0000
Subject: [PATCH 03/16] Fixed Final Update

---
 app/templates/minor/profile.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 394318bcf..0eeac9c18 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -95,17 +95,15 @@ <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Commun
               </select>
               <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{ summerExperience }}' type="text" />
               <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
-              <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>    
-         <div class="left-align">      
-          <p class="pt-2">If you would like to download the Proposal for Community-Engaged Summer Experience, click <a href="/static/files/serviceLearningProposalForm/CCEminorForm1online.docx">here</a>.</p>
+              <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>         
           </div>
             </div>
+          <p class="pt-2">If you would like to download the Proposal for Community-Engaged Summer Experience, click <a href="/static/files/serviceLearningProposalForm/CCEminorForm1online.docx">here</a>.</p>
            </div>
-          </div>
       </div>
       <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars"role="tabpanel" aria-labelledby="pills-bonner-scholars-tab">
         <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{ user.username }}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
       </div>
     </div>
   </div>
-  {% endblock %}
\ No newline at end of file
+  {% endblock %}

From 21954abf3fcd78ee673b59922523a6c637afd892 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Thu, 20 Jun 2024 20:29:22 +0000
Subject: [PATCH 04/16] Finalizing Final Update

---
 app/templates/minor/profile.html | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 0eeac9c18..e3dc750b7 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -1,24 +1,24 @@
-{%set title = "Student Minor Page"%}
+{% set title = "Student Minor Page" %}
 {% extends "base.html" %}
 {% block scripts %}
   {{super()}}
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
-  <script type="text/javascript" src="{{url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate}}"></script>
+  <script type="text/javascript" src="{{ url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate }}"></script>
 {% endblock %}
 {% block styles %}
-  {{super()}}
-  <link rel="styl esheet" href="{{url_for('static', filename='css/minor.css') }}?u={{ lastStaticUpdate}}">
+  {{ super() }}
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/minor.css') }}?u={{ lastStaticUpdate }}">
 {% endblock %}
 {% block app_content %}
   <div class="row">
-    <input id="username" value="{{user.username}}" hidden/>
+    <input id="username" value="{{ user.username }}" hidden />
     <div name="Header" class="row">
       <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h1>
     </div>
     <div class="row">
       <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">
         <li class="col-md-3 col-12 nav-item" role="presentation">
-          <button class="nav-link {{ 'active' if activeTab == 'studentLedEvents' else '' }}" id="studentLedEvents"
+          <button class="nav-link {{ 'active' if activeTab == 'studentLedEvents' or activeTab is not defined else '' }}" id="studentLedEvents"
             data-bs-toggle="pill" data-bs-target="#pills-student-led" type="button" role="tab" aria-controls="pills-student-led" aria-selected="true">Sustained Community Engagements</button>
         </li>
         <li class="col-md-3 col-12 nav-item" role="presentation">
@@ -34,18 +34,18 @@ <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h1>
       </ul>
     </div>
     <div class="tab-content" id="pills-tabContent">
-      <div class="tab-pane fade show {{ 'active' if activeTab == 'studentLedEvents' else '' }}" id="pills-student-led" role="tabpanel" aria-labelledby="pills-student-led-tab">
-        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagementactivities can be credited in a single semester.</p>
+      <div class="tab-pane fade show {{ 'active' if activeTab == 'studentLedEvents' or activeTab is not defined else '' }}" id="pills-student-led" role="tabpanel" aria-labelledby="studentLedEvents">
+        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
         <div class="accordion" id="communityEngagement">
           {% if sustainedEngagementByTerm %}
           {% for term, engagements in sustainedEngagementByTerm.items() %}
           <div class="accordion-item">
             <h3 class="accordion-header" id="headingOne">
-              <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{loop.index}}" aria-expanded="true" aria-controls="collapse{{loop.index}}">
+              <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ loop.index }}" aria-expanded="true" aria-controls="collapse{{ loop.index }}">
                 {{term[0]}}
               </button>
             </h3>
-            <div id="collapse{{loop.index}}" class="accordion-collapse collapse" aria-labelledby="heading{{loop.index}}" data-bs-parent="#communityEngagement">
+            <div id="collapse{{ loop.index }}" class="accordion-collapse collapse" aria-labelledby="heading{{ loop.index }}" data-bs-parent="#communityEngagement">
               <div class="accordion-body">
                 <div class="container-fluid col-10">
                   <div class="row d-flex justify-content-center mb-3">
@@ -58,7 +58,7 @@ <h3 class="accordion-header" id="headingOne">
                         </thead>
                         <tbody>
                           {% for engagement in engagements %}
-                          <tr class="engagement-row" data-engagement-data='{{engagement|tojson}}'>
+                          <tr class="engagement-row" data-engagement-data='{{ engagement|tojson }}'>
                             <td>
                               <input type="checkbox" {{ 'checked' if engagement['matched'] else '' }} />
                               <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
@@ -82,7 +82,7 @@ <h2>You have not participated in any service learning events or courses.</h2>
           {% endif %}
         </div>
       </div>
-      <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="pills-training-tab">
+      <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="trainingEvents">
         <div name="Community-Engaged Summer Experience" class="pt-4">
           <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
           <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
@@ -96,14 +96,14 @@ <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Commun
               <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{ summerExperience }}' type="text" />
               <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
               <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>         
-          </div>
             </div>
+          </div>
           <p class="pt-2">If you would like to download the Proposal for Community-Engaged Summer Experience, click <a href="/static/files/serviceLearningProposalForm/CCEminorForm1online.docx">here</a>.</p>
-           </div>
+        </div>
       </div>
-      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars"role="tabpanel" aria-labelledby="pills-bonner-scholars-tab">
+      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerScholarsEvents">
         <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{ user.username }}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
       </div>
     </div>
   </div>
-  {% endblock %}
+{% endblock %}
\ No newline at end of file

From 45ceed49c8539402ae45a8edb232ad88d7687c5e Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Fri, 28 Jun 2024 13:14:18 -0400
Subject: [PATCH 05/16] Update for Mahak

---
 app/controllers/minor/routes.py  |  30 +-------
 app/templates/minor/profile.html | 126 ++++++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 29 deletions(-)

diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index 42e165b15..5b4dd0c53 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -22,13 +22,14 @@ def viewCceMinor(username):
     sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
     selectedSummerTerm, summerExperience = getSummerExperience(username)
 
+    terms = selectSurroundingTerms(g.current_term)
     return render_template("minor/profile.html",
                             user = User.get_by_id(username),
                             sustainedEngagementByTerm = sustainedEngagementByTerm,
                             summerExperience = summerExperience if summerExperience else "",
                             selectedSummerTerm = selectedSummerTerm,
                             totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
-                            summerTerms = getSummerTerms())
+                            summerTerms = getSummerTerms(), terms=terms) 
 
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
@@ -58,33 +59,6 @@ def modifyCommunityEngagement(username):
     
     return ""
 
-@minor_bp.route('/cceMinor/<username>/requestOtherCommunityEngagement', methods=['GET', 'POST'])
-def requestOtherEngagement(username):
-    """
-        Load the "request other" form and submit it.
-    """
-    user = User.get_by_id(username)
-    terms = selectSurroundingTerms(g.current_term)
-    
-
-    if request.method == 'POST':
-        filename = None
-        attachment = request.files.get("attachmentObject")
-        if attachment:
-                addFile = FileHandler(getFilesFromRequest(request))
-                addFile.saveFiles()
-                filename = attachment.filename
-        formData = request.form.copy()
-        formData["filename"] = filename
-        saveOtherEngagementRequest(formData)
-        flash("Other community engagement request submitted.", "success")
-        return redirect(url_for("minor.viewCceMinor", username=user))
-
-
-    return render_template("/minor/requestOtherEngagement.html",
-                            user=user,
-                            terms=terms)
-
 @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
 def addSummerExperience(username):
     saveSummerExperience(username, request.form, g.current_user)
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index e3dc750b7..ec26bfb0b 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -102,7 +102,131 @@ <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Commun
         </div>
       </div>
       <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerScholarsEvents">
-        <a class="col-md-auto btn btn-primary btn-sm" role="button" href="/cceMinor/{{ user.username }}/requestOtherCommunityEngagement" style="margin:5px">Request Other Experience</a>
+        <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{request.path}}" method="POST">
+          <div class='row'>
+              <div class="container text-center">
+                <div class='form-group mb-4'>
+                  <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
+                  <input type="hidden" value="{{user}}" name="user"/>
+                </div>
+              </div>
+        
+              <div class="form-group">
+                <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
+                <select class="form-select" name="term" id="inputTerm" required>
+                  {% for term in terms %}   
+                    <option value="{{term}}">{{term.description}}</option>
+                  {% endfor %}
+                </select>
+              </div>
+        
+              <br><br><br><br>
+        
+              <div class="from-group">
+                <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
+                <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
+              </div>
+        
+              <br> <br> <br> <br>
+        
+              <div class="form-group">
+                <br>
+                <h4> Company/Organization Information </h4>
+                <hr>
+              </div>
+        
+              <div class="form-group">
+                <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
+                <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
+              </div>
+        
+              <br>
+        
+              <div class="form-group">
+                <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
+                <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
+              </div>
+        
+              <br>
+        
+              <div class="row">
+                <div class="form-group col-6">
+                  <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
+                  <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+                </div>
+        
+                <div class="form-group col-6">
+                  <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
+                  <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+                </div>
+              </div>
+        
+              <br> 
+        
+              <div class="form-group">
+                <br>
+                <h4> Supervisor Information </h4>
+                <hr>
+              </div>
+        
+              <div class="row">
+                <div class="form-group col-6">
+                  <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
+                  <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
+                </div>
+        
+                <div class="form-group col-6">
+                  <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
+                  <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+                </div>
+              </div>
+        
+              <br>
+        
+              <div class="form-group">
+              <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
+                <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
+              </div>
+        
+              <br>
+        
+              <div class="form-group">
+                <br>
+                <h4> Experience Information </h4>
+                <hr>
+              </div>
+        
+              <div class="form-group">
+                <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
+                <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
+              </div>
+        
+              <br>
+        
+              <div class="form-group">
+                <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
+                <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
+              </div>
+        
+              <br>
+        
+              <div class="form-group">
+                <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
+                <textarea class="form-control" rows="5" cols="72" id="experienceDescription" type="text" placeholder="Please describe your experience" name="description" required></textarea>
+                <br>
+              </div>
+        
+              {% if filepaths %}
+                <div class="form-group col-md-4 mb-4">
+                  {% from 'displayFilesMacro.html' import displayFiles %}
+                  {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
+                  {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+                </div>
+              {% endif %}
+        
+              <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+          </div>
+        </form>
       </div>
     </div>
   </div>

From 95ad2c9f8bcc03b9619113a8347b0a8d4fd17e88 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:28:50 -0400
Subject: [PATCH 06/16] Testing with Seedy

---
 app/controllers/minor/routes.py    |  38 ++-
 app/logic/summerExperienceUtils.py |  11 +
 app/models/summerExperience.py     |  38 +++
 app/templates/minor/profile.html   | 428 +++++++++++++++++++----------
 4 files changed, 374 insertions(+), 141 deletions(-)
 create mode 100644 app/logic/summerExperienceUtils.py
 create mode 100644 app/models/summerExperience.py

diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index 5b4dd0c53..ef7a43dfb 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -2,7 +2,9 @@
 from peewee import DoesNotExist
 
 from app.controllers.minor import minor_bp
+from app.models.summerExperience import SummerExperience
 from app.models.user import User
+from app.logic.summerExperienceUtils import saveSummerExperience
 from app.models.term import Term
 from app.models.attachmentUpload import AttachmentUpload
 
@@ -11,6 +13,40 @@
 from app.logic.minor import getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm, removeSummerExperience
 from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal
 
+
+# ##################################################################################
+@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+def addSummerExperience(username):
+    user = User.get(User.username == username)
+    summer_experience_data = {
+        'user': user,
+        'fullName': request.form['studentName'],
+        'email': request.form['studentEmail'],
+        # Add all other fields from the form
+        'roleDescription': request.form['roleDescription'],
+        'experienceType': request.form['experienceType'],
+        'contentArea': request.form.getlist('contentArea'),
+        'experienceHoursOver300': request.form['experienceHoursOver300'] == 'Yes',
+        'experienceHoursBelow300': request.form['experienceHoursBelow300'],
+        'dateCreated': request.form['dateCreated'],
+        'company': request.form['company'],
+        'companyAddress': request.form['companyAddress'],
+        'companyPhone': request.form['companyPhone'],
+        'companyWebsite': request.form['companyWebsite'],
+        'supervisorPhone': request.form['supervisorPhone'],
+        'supervisorEmail': request.form['supervisorEmail'],
+        'totalHours': request.form['totalHours'],
+        'weeks': request.form['weeks'],
+        'description': request.form['description'],
+        'filename': request.form['filename'],
+        'status': 'Pending'  # or however you want to set the initial status
+    }
+    
+    saveSummerExperience(summer_experience_data)
+    
+    return redirect(url_for('minor_bp.viewCceMinor', username=username))
+#######################################################################################
+
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
     """
@@ -59,7 +95,7 @@ def modifyCommunityEngagement(username):
     
     return ""
 
-@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+# @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
 def addSummerExperience(username):
     saveSummerExperience(username, request.form, g.current_user)
 
diff --git a/app/logic/summerExperienceUtils.py b/app/logic/summerExperienceUtils.py
new file mode 100644
index 000000000..001750d58
--- /dev/null
+++ b/app/logic/summerExperienceUtils.py
@@ -0,0 +1,11 @@
+from app.models.summerExperience import SummerExperience
+
+def saveSummerExperience(summer_experience_data):
+    """
+    Save the summer experience data to the database.
+    
+    Parameters:
+    summer_experience_data (dict): Dictionary containing the summer experience data.
+    """
+    SummerExperience.create(**summer_experience_data)
+
diff --git a/app/models/summerExperience.py b/app/models/summerExperience.py
new file mode 100644
index 000000000..47e445a16
--- /dev/null
+++ b/app/models/summerExperience.py
@@ -0,0 +1,38 @@
+from app.models import *
+from app.models.communityEngagementRequest import CommunityEngagementRequest
+from app.models.term import Term
+from app.models.user import User
+from app.logic.minor import getMinorProgress # might need it
+
+class SummerExperience(baseModel):
+    # Imported from User
+    user = ForeignKeyField(User)
+    fullName = User.fullName
+    bnumber = User.bnumber
+    email = User.email
+    dateCreated = DateField()
+  
+
+    # Imported from CommunityEngagementRequest.py
+    company = CommunityEngagementRequest.company
+    companyAddress = CommunityEngagementRequest.companyAddress
+    companyPhone = CommunityEngagementRequest.companyPhone
+    companyWebsite = CommunityEngagementRequest.companyWebsite
+    supervisorPhone = CommunityEngagementRequest.supervisorPhone
+    supervisorEmail = CommunityEngagementRequest.supervisorEmail
+    totalHours = CommunityEngagementRequest.totalHours
+    weeks = CommunityEngagementRequest.weeks
+    description = CommunityEngagementRequest.description
+    filename = CommunityEngagementRequest.filename
+    status = CommunityEngagementRequest.status
+
+    # Added fields
+    roleDescription = CharField()
+    experienceType = CharField()
+    contentArea = CharField()  # Verify if the content area(s) needs to be recorded to the database as they are named or just their count
+    experienceHoursOver300 = BooleanField()
+    experienceHoursBelow300 = CharField()
+    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")])
+
+
+
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index ec26bfb0b..ad9471e21 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -1,19 +1,22 @@
 {% set title = "Student Minor Page" %}
 {% extends "base.html" %}
+
 {% block scripts %}
-  {{super()}}
+  {{ super() }}
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
   <script type="text/javascript" src="{{ url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate }}"></script>
 {% endblock %}
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" href="{{ url_for('static', filename='css/minor.css') }}?u={{ lastStaticUpdate }}">
 {% endblock %}
+
 {% block app_content %}
   <div class="row">
     <input id="username" value="{{ user.username }}" hidden />
     <div name="Header" class="row">
-      <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h1>
+      <h1>{{ user.firstName }} {{ user.lastName }}'s CCE Minor Profile</h1>
     </div>
     <div class="row">
       <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">
@@ -42,7 +45,7 @@ <h1>{{user.firstName}} {{user.lastName}}'s CCE Minor Profile</h1>
           <div class="accordion-item">
             <h3 class="accordion-header" id="headingOne">
               <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ loop.index }}" aria-expanded="true" aria-controls="collapse{{ loop.index }}">
-                {{term[0]}}
+                {{ term[0] }}
               </button>
             </h3>
             <div id="collapse{{ loop.index }}" class="accordion-collapse collapse" aria-labelledby="heading{{ loop.index }}" data-bs-parent="#communityEngagement">
@@ -61,14 +64,14 @@ <h3 class="accordion-header" id="headingOne">
                           <tr class="engagement-row" data-engagement-data='{{ engagement|tojson }}'>
                             <td>
                               <input type="checkbox" {{ 'checked' if engagement['matched'] else '' }} />
-                              <button type="button" class="btn btn-link">{{engagement["name"]}}</button>
+                              <button type="button" class="btn btn-link">{{ engagement["name"] }}</button>
                             </td>
                           </tr>
                           {% endfor %}
                         </tbody>
                       </table>
                     </div>
-                    <div class="col-md-6 p-3" id="set{{term[1]}}">
+                    <div class="col-md-6 p-3" id="set{{ term[1] }}">
                       Click on an engagement entry to see your event history or course information.
                     </div>
                   </div>
@@ -84,150 +87,295 @@ <h2>You have not participated in any service learning events or courses.</h2>
       </div>
       <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="trainingEvents">
         <div name="Community-Engaged Summer Experience" class="pt-4">
-          <h3 class="col-md-auto {% if summerExperience %}bi bi-check2 {% endif %}">Community-Engaged Summer Experience</h3>
-          <p class="pt-2">Must include at least 300 hours of work over the span of 8 weeks with a public-facing organization with a focus on applied work.</p>
-          <div class="row-auto col-md-6">
-            <div class="input-group">
-              <select class="form-select" name='term' id='summerExperienceTerm' required>
-                {% for term in summerTerms %}
-                <option value="{{ term.description }}" {{ "selected" if term.description == selectedSummerTerm }}>{{term.description}}</option>
-                {% endfor %}
-              </select>
-              <input class="form-control" placeholder="Experience name" id="summerExperience" value='{{ summerExperience }}' type="text" />
-              <button type="button" class="btn btn-primary btn-md" id="summerExperienceSave">Save</button>
-              <button type="button" class="btn btn-danger btn-md" id="removeSummerExperience">Clear</button>         
-            </div>
-          </div>
-          <p class="pt-2">If you would like to download the Proposal for Community-Engaged Summer Experience, click <a href="/static/files/serviceLearningProposalForm/CCEminorForm1online.docx">here</a>.</p>
-        </div>
-      </div>
-      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerScholarsEvents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerScholarsEvents">
-        <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{request.path}}" method="POST">
-          <div class='row'>
-              <div class="container text-center">
-                <div class='form-group mb-4'>
-                  <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
-                  <input type="hidden" value="{{user}}" name="user"/>
+          <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor_bp.addSummerExperience', username=user.username) }}" method="POST">
+            <div class='row'>
+              <div class="container">
+                <div class='form-group mb-4 text-center'>
+                  <h3 class='form-label' for='studentUser' style="color: #000000;">COMMUNITY AND CIVIC ENGAGEMENT MINOR (CCE)</h3>
+                  <h4>Proposal for Community-Engaged Summer Experience</h4>
+                  <p>
+                    The minor requires an Intensive Community-Engaged Summer Experience that is focused on work that more deeply explores at least one of the four following key content areas: power and inequality, community and identity, civic literacy, or civic skills. Please fill out the following form and return to your CCE Minor Advisor for approval.
+                  </p>
                 </div>
-              </div>
-        
-              <div class="form-group">
-                <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
-                <select class="form-select" name="term" id="inputTerm" required>
-                  {% for term in terms %}   
-                    <option value="{{term}}">{{term.description}}</option>
-                  {% endfor %}
-                </select>
-              </div>
-        
-              <br><br><br><br>
-        
-              <div class="from-group">
-                <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
-                <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
-              </div>
-        
-              <br> <br> <br> <br>
-        
-              <div class="form-group">
-                <br>
-                <h4> Company/Organization Information </h4>
-                <hr>
-              </div>
-        
-              <div class="form-group">
-                <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-                <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
-              </div>
-        
-              <br>
-        
-              <div class="form-group">
-                <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-                <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
-              </div>
-        
-              <br>
-        
-              <div class="row">
-                <div class="form-group col-6">
-                  <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-                  <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+      
+                <div class="form-group">
+                  <br>
+                  <h4> Student Information </h4>
+                  <hr>
                 </div>
-        
-                <div class="form-group col-6">
-                  <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-                  <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+      
+                <div class="row">
+                  <div class="form-group col-6">
+                    <label class="form-label" for="studentName"> <strong>Student Name</strong> </label>
+                    <input class="form-control name-input" id="studentName" name="studentName" value="{{ user.fullName }}" />
+                  </div>
+                  <div class="form-group col-6">
+                    <label class="form-label" for="studentEmail"> <strong>Email</strong> </label>
+                    <input class="form-control email-input" id="studentEmail" name="studentEmail" value="{{ user.email }}" />
+                    <br>
+                  </div>
                 </div>
-              </div>
-        
-              <br> 
-        
-              <div class="form-group">
-                <br>
-                <h4> Supervisor Information </h4>
-                <hr>
-              </div>
-        
-              <div class="row">
-                <div class="form-group col-6">
-                  <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-                  <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
+      
+                <div class="row">
+                  <div class="form-group col-md-6">
+                    <label class="form-label me-2" for="date"><strong>Today's Date</strong></label>
+                    <br>
+                    <input type="date" id="date" name="date">
+                  </div>
                 </div>
-        
-                <div class="form-group col-6">
-                  <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-                  <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+      
+                <div class="form-group">
+                  <br>
+                  <h4> Company/Organization Information </h4>
+                  <hr>
                 </div>
-              </div>
-        
-              <br>
-        
-              <div class="form-group">
-              <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
-                <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
-              </div>
-        
-              <br>
-        
-              <div class="form-group">
+      
+                <div class="form-group">
+                  <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
+                  <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company" />
+                </div>
+      
                 <br>
-                <h4> Experience Information </h4>
-                <hr>
-              </div>
-        
-              <div class="form-group">
-                <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
-                <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
-              </div>
-        
-              <br>
-        
-              <div class="form-group">
-                <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
-                <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
-              </div>
-        
-              <br>
-        
-              <div class="form-group">
-                <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
-                <textarea class="form-control" rows="5" cols="72" id="experienceDescription" type="text" placeholder="Please describe your experience" name="description" required></textarea>
+      
+                <div class="form-group">
+                  <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
+                  <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" />
+                </div>
+      
                 <br>
-              </div>
-        
-              {% if filepaths %}
-                <div class="form-group col-md-4 mb-4">
-                  {% from 'displayFilesMacro.html' import displayFiles %}
-                  {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
-                  {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+      
+                <div class="row">
+                  <div class="form-group col-6">
+                    <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
+                    <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" />
+                  </div>
+                  <div class="form-group col-6">
+                    <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
+                    <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" />
+                  </div>
+                </div>
+      
+                <br> 
+      
+                <div class="form-group">
+                  <br>
+                  <h4> Supervisor Information </h4>
+                  <hr>
+                </div>
+      
+                <div class="row">
+                  <div class="form-group col-6">
+                    <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
+                    <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" />
+                  </div>
+                  <div class="form-group col-6">
+                    <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
+                    <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" />
+                    <br>
+                  </div>
+                </div>
+      
+                <div class="form-group">
+                  <br>
+                  <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector) that is responsive to community-identified initiatives or needs:</strong></label> <br>
+                  <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Please describe your experience" required></textarea>
+                
+                  <br><br>
+                
+                  <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please check one.</strong></label><br>
+                  <input type="checkbox" id="internship" name="experienceType" value="Internship">
+                  <label for="internship">Internship</label><br>
+                
+                  <input type="checkbox" id="cbr" name="experienceType" value="Community-based research">
+                  <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
+                
+                  <input type="checkbox" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
+                  <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
+                
+                  <input type="checkbox" id="epgInternship" name="experienceType" value="EPG Summer Internship">
+                  <label for="epgInternship">EPG Summer Internship</label><br>
+                
+                  <input type="checkbox" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
+                  <label for="bonnerService">Bonner Scholar Summer of Service</label><br>
+                
+                  <input type="checkbox" id="otherExperience" name="experienceType" value="Other">
+                  <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
+                  <textarea class="form-control" rows="2" cols="72" id="experienceDescription" name="experienceDescription" placeholder="Please describe your summer experience" required></textarea>
+                
+                  <br><br>
+                
+                  <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please check all that apply.</strong></label><br>
+                  <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
+                  <label for="powerInequality">Power and inequality</label><br>
+                
+                  <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
+                  <label for="communityIdentity">Community and identity</label><br>
+                
+                  <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
+                  <label for="civicLiteracy">Civic literacy</label><br>
+                
+                  <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
+                  <label for="civicSkills">Civic skills</label>
+                
+                  <br><br>
+                
+                  <label><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks with a public-facing organization?</strong></label><br>
+                  <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes">
+                  <label for="yes300hours">Yes</label>
+                
+                  <input type="radio" id="no300hours" name="experienceHoursOver300" value="No">
+                  <label for="no300hours">No</label>
+                
+                  <br><br>
+                
+                  <label for="experienceHoursBelow300"><strong>If no, how many hours over how many weeks will you spend engaged in this summer experience?</strong></label>
+                  <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks" required></textarea>
+                
+                  <br><br>
+                
+                  {% if filepaths %}
+                  <div class="form-group col-md-4 mb-4">
+                    {% from 'displayFilesMacro.html' import displayFiles %}
+                    {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
+                    {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+                  </div>
+                  {% endif %}
+    
+                <div class="text-center">
+                  <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
                 </div>
-              {% endif %}
-        
-              <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+              </div>
+            </div>
           </div>
-        </form>
+        </form> 
       </div>
     </div>
+    <div class="tab-pane fade {{ 'active' if activetab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
+      <form id='requestothercommeng' enctype="multipart/form-data" role='form' action="{{request.path}}" method="post">
+        <div class='row'>
+          <div class="container text-center">
+            <div class='form-group mb-4'>
+              <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
+              <input type="hidden" value="{{user}}" name="user"/>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
+            <select class="form-select" name="term" id="inputTerm" required>
+              {% for term in terms %}   
+              <option value="{{term}}">{{term.description}}</option>
+              {% endfor %}
+            </select>
+          </div>
+
+          <br><br><br><br>
+
+          <div class="from-group">
+            <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
+            <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
+          </div>
+
+          <br><br><br><br>
+
+          <div class="form-group">
+            <br>
+            <h4> Company/Organization Information </h4>
+            <hr>
+          </div>
+
+          <div class="form-group">
+            <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
+            <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
+          </div>
+
+          <br>
+
+          <div class="form-group">
+            <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
+            <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
+          </div>
+
+          <br>
+
+          <div class="row">
+            <div class="form-group col-6">
+              <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
+              <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+            </div>
+
+            <div class="form-group col-6">
+              <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
+              <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+            </div>
+          </div>
+
+          <br> 
+
+          <div class="form-group">
+            <br>
+            <h4> Supervisor Information </h4>
+            <hr>
+          </div>
+
+          <div class="row">
+            <div class="form-group col-6">
+              <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
+              <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
+            </div>
+
+            <div class="form-group col-6">
+              <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
+              <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+            </div>
+          </div>
+
+          <br>
+
+          <div class="form-group">
+            <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
+            <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
+          </div>
+
+          <br>
+
+          <div class="form-group">
+            <br>
+            <h4> Experience Information </h4>
+            <hr>
+          </div>
+
+          <div class="form-group">
+            <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
+            <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
+          </div>
+
+          <br>
+
+          <div class="form-group">
+            <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
+            <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
+          </div>
+
+          <br>
+
+          <div class="form-group">
+            <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
+            <textarea class="form-control" rows="5" cols="72" id="experienceDescription" name="description" placeholder="Please describe your experience" required></textarea>
+            <br>
+          </div>
+
+          {% if filepaths %}
+          <div class="form-group col-md-4 mb-4">
+            {% from 'displayFilesMacro.html' import displayFiles %}
+            {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
+            {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+          </div>
+          {% endif %}
+
+          <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+        </div>
+      </form>
+    </div>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From a311d3562b18384d885f5791fe67cfb8d4a59e33 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:35:37 -0400
Subject: [PATCH 07/16] Updates of the day

---
 app/controllers/minor/routes.py  |  23 +--
 app/models/summerExperience.py   |  43 +++---
 app/templates/minor/profile.html | 232 +++++++++++++------------------
 3 files changed, 129 insertions(+), 169 deletions(-)

diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index ef7a43dfb..6b3cfa4bc 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -15,14 +15,15 @@
 
 
 # ##################################################################################
-@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+# /profile/<username>/cceMinor
+@minor_bp.route('/profile/<username>/cceMinorr', methods=['POST', 'GET']) 
 def addSummerExperience(username):
     user = User.get(User.username == username)
     summer_experience_data = {
         'user': user,
-        'fullName': request.form['studentName'],
+        'fullName': request.form['fullName'],
         'email': request.form['studentEmail'],
-        # Add all other fields from the form
+        # All other fields from the form
         'roleDescription': request.form['roleDescription'],
         'experienceType': request.form['experienceType'],
         'contentArea': request.form.getlist('contentArea'),
@@ -41,10 +42,19 @@ def addSummerExperience(username):
         'filename': request.form['filename'],
         'status': 'Pending'  # or however you want to set the initial status
     }
+    print("test", summer_experience_data)
     
     saveSummerExperience(summer_experience_data)
+
+    return render_template("minor/profile.html")
     
-    return redirect(url_for('minor_bp.viewCceMinor', username=username))
+    # return redirect(url_for('minor_bp.viewCceMinor', username=username))
+
+
+def addSummerExperience(username):
+    saveSummerExperience(username, request.form, g.current_user)
+
+    return ""
 #######################################################################################
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
@@ -95,11 +105,6 @@ def modifyCommunityEngagement(username):
     
     return ""
 
-# @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
-def addSummerExperience(username):
-    saveSummerExperience(username, request.form, g.current_user)
-
-    return ""
 
 @minor_bp.route('/cceMinor/<username>/deleteSummerExperience', methods=['POST'])
 def deleteSummerExperience(username):        
diff --git a/app/models/summerExperience.py b/app/models/summerExperience.py
index 47e445a16..8f114a3ef 100644
--- a/app/models/summerExperience.py
+++ b/app/models/summerExperience.py
@@ -1,38 +1,35 @@
 from app.models import *
 from app.models.communityEngagementRequest import CommunityEngagementRequest
-from app.models.term import Term
 from app.models.user import User
 from app.logic.minor import getMinorProgress # might need it
+from peewee import CharField, BooleanField, DateField, ForeignKeyField, Check
+# from app.models.baseModel import BaseModel
+from app.models.user import User
+from app.models.communityEngagementRequest import CommunityEngagementRequest
 
 class SummerExperience(baseModel):
-    # Imported from User
-    user = ForeignKeyField(User)
-    fullName = User.fullName
-    bnumber = User.bnumber
-    email = User.email
+    user = ForeignKeyField(User, backref='summer_experiences')
+    fullName = CharField()
+    bnumber = CharField()
+    email = CharField()
     dateCreated = DateField()
-  
 
-    # Imported from CommunityEngagementRequest.py
-    company = CommunityEngagementRequest.company
-    companyAddress = CommunityEngagementRequest.companyAddress
-    companyPhone = CommunityEngagementRequest.companyPhone
-    companyWebsite = CommunityEngagementRequest.companyWebsite
-    supervisorPhone = CommunityEngagementRequest.supervisorPhone
-    supervisorEmail = CommunityEngagementRequest.supervisorEmail
-    totalHours = CommunityEngagementRequest.totalHours
-    weeks = CommunityEngagementRequest.weeks
-    description = CommunityEngagementRequest.description
-    filename = CommunityEngagementRequest.filename
-    status = CommunityEngagementRequest.status
+    company = CharField()
+    companyAddress = CharField()
+    companyPhone = CharField()
+    companyWebsite = CharField()
+    supervisorPhone = CharField()
+    supervisorEmail = CharField()
+    totalHours = CharField()
+    weeks = CharField()
+    description = CharField()
+    filename = CharField()
+    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")])
 
-    # Added fields
     roleDescription = CharField()
     experienceType = CharField()
     contentArea = CharField()  # Verify if the content area(s) needs to be recorded to the database as they are named or just their count
     experienceHoursOver300 = BooleanField()
     experienceHoursBelow300 = CharField()
-    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")])
-
-
 
+ 
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index ad9471e21..24784183b 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -106,21 +106,21 @@ <h4> Student Information </h4>
       
                 <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="studentName"> <strong>Student Name</strong> </label>
-                    <input class="form-control name-input" id="studentName" name="studentName" value="{{ user.fullName }}" />
+                    <label class="form-label" for="fullName"> <strong>Student Name</strong> </label>
+                    <input class="form-control name-input" id="fullName" name="fullName" value="{{ user.fullName }}" />
                   </div>
                   <div class="form-group col-6">
-                    <label class="form-label" for="studentEmail"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="studentEmail" name="studentEmail" value="{{ user.email }}" />
+                    <label class="form-label" for="email"> <strong>Email</strong> </label>
+                    <input class="form-control email-input" id="email" name="email" value="{{ user.email }}" />
                     <br>
                   </div>
                 </div>
       
                 <div class="row">
                   <div class="form-group col-md-6">
-                    <label class="form-label me-2" for="date"><strong>Today's Date</strong></label>
+                    <label class="form-label me-2" for="dateCreated"><strong>Today's Date</strong></label>
                     <br>
-                    <input type="date" id="date" name="date">
+                    <input type="date" id="dateCreated" name="dateCreated">
                   </div>
                 </div>
       
@@ -131,15 +131,15 @@ <h4> Company/Organization Information </h4>
                 </div>
       
                 <div class="form-group">
-                  <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-                  <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company" />
+                  <label class="form-label" for="company"> <strong>Name</strong> </label>
+                  <input class="form-control" id="company" name="company" placeholder="Company or organization's name" />
                 </div>
       
                 <br>
       
                 <div class="form-group">
                   <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-                  <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" />
+                  <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" />
                 </div>
       
                 <br>
@@ -147,11 +147,11 @@ <h4> Company/Organization Information </h4>
                 <div class="row">
                   <div class="form-group col-6">
                     <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" />
+                    <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" />
                   </div>
                   <div class="form-group col-6">
                     <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-                    <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" />
+                    <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" />
                   </div>
                 </div>
       
@@ -166,11 +166,11 @@ <h4> Supervisor Information </h4>
                 <div class="row">
                   <div class="form-group col-6">
                     <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" />
+                    <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" />
                   </div>
                   <div class="form-group col-6">
                     <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" />
+                    <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" />
                     <br>
                   </div>
                 </div>
@@ -250,132 +250,90 @@ <h4> Supervisor Information </h4>
         </form> 
       </div>
     </div>
-    <div class="tab-pane fade {{ 'active' if activetab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
-      <form id='requestothercommeng' enctype="multipart/form-data" role='form' action="{{request.path}}" method="post">
-        <div class='row'>
-          <div class="container text-center">
-            <div class='form-group mb-4'>
-              <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
-              <input type="hidden" value="{{user}}" name="user"/>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
-            <select class="form-select" name="term" id="inputTerm" required>
-              {% for term in terms %}   
-              <option value="{{term}}">{{term.description}}</option>
-              {% endfor %}
-            </select>
-          </div>
-
-          <br><br><br><br>
-
-          <div class="from-group">
-            <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
-            <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
-          </div>
-
-          <br><br><br><br>
-
-          <div class="form-group">
-            <br>
-            <h4> Company/Organization Information </h4>
-            <hr>
-          </div>
-
-          <div class="form-group">
-            <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-            <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
-          </div>
-
-          <br>
-
-          <div class="form-group">
+    <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
+      <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor_bp.addSummerExperience', username=user.username) }}" method="POST">
+        <!-- Form fields here -->
+        <div class="form-group">
+            <label class="form-label" for="fullName"> <strong>Student Name</strong> </label>
+            <input class="form-control name-input" id="fullName" name="fullName" value="{{ user.fullName }}" />
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="email"> <strong>Email</strong> </label>
+            <input class="form-control email-input" id="email" name="email" value="{{ user.email }}" />
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="dateCreated"><strong>Today's Date</strong></label>
+            <input type="date" id="dateCreated" name="dateCreated">
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="company"> <strong>Name</strong> </label>
+            <input class="form-control" id="company" name="company" placeholder="Company or organization's name" />
+        </div>
+        <div class="form-group">
             <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-            <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
-          </div>
-
-          <br>
-
-          <div class="row">
-            <div class="form-group col-6">
-              <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-              <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
-            </div>
-
-            <div class="form-group col-6">
-              <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-              <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
-            </div>
-          </div>
-
-          <br> 
-
-          <div class="form-group">
-            <br>
-            <h4> Supervisor Information </h4>
-            <hr>
-          </div>
-
-          <div class="row">
-            <div class="form-group col-6">
-              <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-              <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
-            </div>
-
-            <div class="form-group col-6">
-              <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-              <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
-            </div>
-          </div>
-
-          <br>
-
-          <div class="form-group">
-            <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
-            <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
-          </div>
-
-          <br>
-
-          <div class="form-group">
-            <br>
-            <h4> Experience Information </h4>
-            <hr>
-          </div>
-
-          <div class="form-group">
-            <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
-            <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
-          </div>
-
-          <br>
-
-          <div class="form-group">
-            <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
-            <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
-          </div>
-
-          <br>
-
-          <div class="form-group">
-            <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
-            <textarea class="form-control" rows="5" cols="72" id="experienceDescription" name="description" placeholder="Please describe your experience" required></textarea>
-            <br>
-          </div>
-
-          {% if filepaths %}
-          <div class="form-group col-md-4 mb-4">
-            {% from 'displayFilesMacro.html' import displayFiles %}
-            {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
-            {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
-          </div>
-          {% endif %}
-
-          <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+            <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" />
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
+            <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" />
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
+            <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" />
+        </div>
+        <div class="form-group">
+            <label class="form-label" for="supervisorPhone"> <strong>Supervisor Phone Number</strong> </label>
+            <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" />
         </div>
-      </form>
+        <div class="form-group">
+            <label class="form-label" for="supervisorEmail"> <strong>Supervisor Email</strong> </label>
+            <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" />
+        </div>
+        <div class="form-group">
+            <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience:</strong></label>
+            <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Please describe your experience" required></textarea>
+        </div>
+        <div class="form-group">
+            <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please check one.</strong></label><br>
+            <input type="checkbox" id="internship" name="experienceType" value="Internship">
+            <label for="internship">Internship</label><br>
+            <input type="checkbox" id="cbr" name="experienceType" value="Community-based research">
+            <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
+            <input type="checkbox" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
+            <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
+            <input type="checkbox" id="epgInternship" name="experienceType" value="EPG Summer Internship">
+            <label for="epgInternship">EPG Summer Internship</label><br>
+            <input type="checkbox" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
+            <label for="bonnerService">Bonner Scholar Summer of Service</label><br>
+            <input type="checkbox" id="otherExperience" name="experienceType" value="Other">
+            <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
+            <textarea class="form-control" rows="2" cols="72" id="experienceDescription" name="experienceDescription" placeholder="Please describe your summer experience" required></textarea>
+        </div>
+        <div class="form-group">
+            <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please check all that apply.</strong></label><br>
+            <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
+            <label for="powerInequality">Power and inequality</label><br>
+            <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
+            <label for="communityIdentity">Community and identity</label><br>
+            <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
+            <label for="civicLiteracy">Civic literacy</label><br>
+            <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
+            <label for="civicSkills">Civic skills</label>
+        </div>
+        <div class="form-group">
+            <label><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks with a public-facing organization?</strong></label><br>
+            <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes">
+            <label for="yes300hours">Yes</label>
+            <input type="radio" id="no300hours" name="experienceHoursOver300" value="No">
+            <label for="no300hours">No</label>
+        </div>
+        <div class="form-group">
+            <label for="experienceHoursBelow300"><strong>If no, how many hours over how many weeks will you spend engaged in this summer experience?</strong></label>
+            <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks" required></textarea>
+        </div>
+        <input class="btn btn-primary" type="submit" value="Send Request for Approval" />
+    </form>
+    
     </div>
   </div>
 {% endblock %}

From 22857d33496cf1880a49f08f4ac42d9e816aa991 Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:35:26 -0400
Subject: [PATCH 08/16] Updating changes to GitHub

---
 app/__init__.py                            |   7 +-
 app/controllers/minor/routes.py            |  80 ++---
 app/logic/minor.py                         |  47 +++
 app/logic/summerExperienceUtils.py         |  11 -
 app/models.py                              |   0
 app/models/individualRequirement.py        |   2 +
 app/models/summerExperience.py             |  43 +--
 app/static/js/profile.js                   |  53 ++++
 app/templates/admin/searchStudentPage.html |   4 +-
 app/templates/base.html                    |   8 +
 app/templates/minor/profile.html           | 342 ++++++++++-----------
 database/migrate_db.sh                     |   1 +
 12 files changed, 344 insertions(+), 254 deletions(-)
 delete mode 100644 app/logic/summerExperienceUtils.py
 create mode 100644 app/models.py
 create mode 100644 app/static/js/profile.js

diff --git a/app/__init__.py b/app/__init__.py
index af22e6334..8d59c6c3b 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,7 +4,8 @@
 from flask import Flask, render_template
 from playhouse.shortcuts import model_to_dict, dict_to_model
 from app.logic.config import load_config_files
-
+app = Flask(__name__)
+app.debug = True  # Enable debug mode
 # Initialize our application
 app = Flask(__name__, template_folder="templates")
 
@@ -111,3 +112,7 @@ def handle_bad_request(e):
 def handle_bad_request(e):
     return render_template("/errors/500error.html",
                             supportEmail = supportContactEmail)
+
+
+if __name__ == '__main__':
+    app.run()
\ No newline at end of file
diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index ef7a43dfb..6574d745c 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -2,50 +2,17 @@
 from peewee import DoesNotExist
 
 from app.controllers.minor import minor_bp
-from app.models.summerExperience import SummerExperience
 from app.models.user import User
-from app.logic.summerExperienceUtils import saveSummerExperience
 from app.models.term import Term
 from app.models.attachmentUpload import AttachmentUpload
 
 from app.logic.fileHandler import FileHandler
 from app.logic.utils import selectSurroundingTerms, getFilesFromRequest
 from app.logic.minor import getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm, removeSummerExperience
-from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal
+from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal, createSummerExperience
+
 
 
-# ##################################################################################
-@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
-def addSummerExperience(username):
-    user = User.get(User.username == username)
-    summer_experience_data = {
-        'user': user,
-        'fullName': request.form['studentName'],
-        'email': request.form['studentEmail'],
-        # Add all other fields from the form
-        'roleDescription': request.form['roleDescription'],
-        'experienceType': request.form['experienceType'],
-        'contentArea': request.form.getlist('contentArea'),
-        'experienceHoursOver300': request.form['experienceHoursOver300'] == 'Yes',
-        'experienceHoursBelow300': request.form['experienceHoursBelow300'],
-        'dateCreated': request.form['dateCreated'],
-        'company': request.form['company'],
-        'companyAddress': request.form['companyAddress'],
-        'companyPhone': request.form['companyPhone'],
-        'companyWebsite': request.form['companyWebsite'],
-        'supervisorPhone': request.form['supervisorPhone'],
-        'supervisorEmail': request.form['supervisorEmail'],
-        'totalHours': request.form['totalHours'],
-        'weeks': request.form['weeks'],
-        'description': request.form['description'],
-        'filename': request.form['filename'],
-        'status': 'Pending'  # or however you want to set the initial status
-    }
-    
-    saveSummerExperience(summer_experience_data)
-    
-    return redirect(url_for('minor_bp.viewCceMinor', username=username))
-#######################################################################################
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
@@ -67,6 +34,49 @@ def viewCceMinor(username):
                             totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
                             summerTerms = getSummerTerms(), terms=terms) 
 
+
+# ########################################################################################
+from flask import request, redirect, url_for, flash
+from app.models.summerExperience import SummerExperience
+from app.models.user import User
+from app.models.term import Term
+from app.controllers.minor import minor_bp
+
+@minor_bp.route('/profile/<username>/addSummerExperience', methods=['POST'])
+def addSummerExperience(username):
+    try:
+        user = User.get(User.username == username)
+        term = Term.get(Term.id == request.form['term'])
+        
+        experience_type = request.form['experienceType']
+        if experience_type == 'Other':
+            experience_type = request.form.get('otherExperienceDescription', '')
+
+        SummerExperience.create(
+            user=user,
+            term=term,
+            roleDescription=request.form['roleDescription'],
+            experienceType=experience_type,
+            CceMinorContentArea=', '.join(request.form.getlist('contentArea')),
+            experienceHoursOver300=request.form['experienceHoursOver300'] == 'Yes',
+            experienceHoursBelow300=request.form.get('experienceHoursBelow300', ''),
+            status='Pending',
+            company=request.form['company'],
+            companyAddress=request.form['companyAddress'],
+            companyPhone=request.form['companyPhone'],
+            companyWebsite=request.form['companyWebsite'],
+            supervisorPhone=request.form['supervisorPhone'],
+            supervisorEmail=request.form['supervisorEmail'],
+            created_at=datetime.datetime.now()
+        )
+        flash('Summer Experience added successfully!', 'success')
+    except Exception as e:
+        flash(f'An error occurred while adding the summer experience: {e}', 'danger')
+    return redirect(url_for('minor.viewCceMinor', username=username))
+
+# ########################################################################################
+
+
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
     """
diff --git a/app/logic/minor.py b/app/logic/minor.py
index a1068442d..1dfc5b851 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -15,6 +15,53 @@
 from app.models.individualRequirement import IndividualRequirement
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.communityEngagementRequest import CommunityEngagementRequest
+from app.models.summerExperience import SummerExperience # Added
+
+
+
+# ###################################################################
+import logging
+
+def createSummerExperience(username, form_data):
+    try:
+        user = User.get(User.username == username)
+        term = Term.get(Term.id == form_data['term'])
+        content_area = ','.join(form_data.getlist('contentArea'))  # Combine multiple content areas
+
+        # Determine the experience type
+        experience_type = form_data['experienceType']
+        if experience_type == 'Other':
+            other_experience_description = form_data.get('otherExperienceDescription', '')
+            if not other_experience_description:
+                raise ValueError("Other experience description is required.")
+            experience_type = other_experience_description
+
+        SummerExperience.create(
+            user=user,
+            term=term,
+            roleDescription=form_data['roleDescription'],
+            experienceType=experience_type,
+            contentArea=content_area,
+            experienceHoursOver300=form_data['experienceHoursOver300'] == 'Yes',
+            experienceHoursBelow300=form_data.get('experienceHoursBelow300'),
+            status='Pending',
+            company=form_data['company'],
+            companyAddress=form_data['companyAddress'],
+            companyPhone=form_data['companyPhone'],
+            companyWebsite=form_data['companyWebsite'],
+            supervisorPhone=form_data['supervisorPhone'],
+            supervisorEmail=form_data['supervisorEmail']
+        )
+        logging.info("Summer experience successfully saved.")
+    except DoesNotExist as e:
+        logging.error(f"Error saving summer experience: User or Term not found - {e}")
+        raise
+    except Exception as e:
+        logging.error(f"Error saving summer experience: {e}")
+        raise
+
+
+# ###################################################################
 
 def getEngagementTotal(engagementData):
     """ 
diff --git a/app/logic/summerExperienceUtils.py b/app/logic/summerExperienceUtils.py
deleted file mode 100644
index 001750d58..000000000
--- a/app/logic/summerExperienceUtils.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from app.models.summerExperience import SummerExperience
-
-def saveSummerExperience(summer_experience_data):
-    """
-    Save the summer experience data to the database.
-    
-    Parameters:
-    summer_experience_data (dict): Dictionary containing the summer experience data.
-    """
-    SummerExperience.create(**summer_experience_data)
-
diff --git a/app/models.py b/app/models.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/models/individualRequirement.py b/app/models/individualRequirement.py
index 70640ef4a..c598f75a6 100644
--- a/app/models/individualRequirement.py
+++ b/app/models/individualRequirement.py
@@ -6,6 +6,7 @@
 from app.models.course import Course
 from app.models.program import Program
 from app.models.certificationRequirement import CertificationRequirement
+from app.models.summerExperience import SummerExperience
 
 
 class IndividualRequirement(baseModel):
@@ -17,6 +18,7 @@ class IndividualRequirement(baseModel):
     requirement = ForeignKeyField(CertificationRequirement)
     addedBy = ForeignKeyField(User)
     addedOn = DateTimeField(default=datetime.now)
+    # summer_experience = ForeignKeyField(SummerExperience, null=True)
 
     class Meta:
         constraints = [SQL('UNIQUE (username_id, requirement_id)')]
diff --git a/app/models/summerExperience.py b/app/models/summerExperience.py
index 47e445a16..cf84d0e33 100644
--- a/app/models/summerExperience.py
+++ b/app/models/summerExperience.py
@@ -1,38 +1,21 @@
+import datetime
 from app.models import *
-from app.models.communityEngagementRequest import CommunityEngagementRequest
 from app.models.term import Term
 from app.models.user import User
-from app.logic.minor import getMinorProgress # might need it
 
 class SummerExperience(baseModel):
-    # Imported from User
     user = ForeignKeyField(User)
-    fullName = User.fullName
-    bnumber = User.bnumber
-    email = User.email
-    dateCreated = DateField()
-  
-
-    # Imported from CommunityEngagementRequest.py
-    company = CommunityEngagementRequest.company
-    companyAddress = CommunityEngagementRequest.companyAddress
-    companyPhone = CommunityEngagementRequest.companyPhone
-    companyWebsite = CommunityEngagementRequest.companyWebsite
-    supervisorPhone = CommunityEngagementRequest.supervisorPhone
-    supervisorEmail = CommunityEngagementRequest.supervisorEmail
-    totalHours = CommunityEngagementRequest.totalHours
-    weeks = CommunityEngagementRequest.weeks
-    description = CommunityEngagementRequest.description
-    filename = CommunityEngagementRequest.filename
-    status = CommunityEngagementRequest.status
-
-    # Added fields
-    roleDescription = CharField()
+    term = ForeignKeyField(Term)
+    roleDescription = TextField()
     experienceType = CharField()
-    contentArea = CharField()  # Verify if the content area(s) needs to be recorded to the database as they are named or just their count
+    CceMinorContentArea = TextField()  # Store as comma-separated values or use a related table if needed
     experienceHoursOver300 = BooleanField()
-    experienceHoursBelow300 = CharField()
-    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")])
-
-
-
+    experienceHoursBelow300 = CharField(null=True)  # Optional for hours if less than 300
+    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")], default='Pending') # To be checked later. We might need to create a function that validates that status can only be 'Approved' if experienceType is not null.
+    company = CharField()
+    companyAddress = CharField()
+    companyPhone = CharField()
+    companyWebsite = CharField()
+    supervisorPhone = CharField()
+    supervisorEmail = CharField()
+    created_at = DateTimeField(default=datetime.datetime.now)
diff --git a/app/static/js/profile.js b/app/static/js/profile.js
new file mode 100644
index 000000000..6261cfb5e
--- /dev/null
+++ b/app/static/js/profile.js
@@ -0,0 +1,53 @@
+// app/static/js/profile.js
+import searchUser from './searchUser.js';
+
+function callback(selected) {
+  console.log('Selected student:', selected);
+  // Set the input value to the full name
+  $("#searchStudentsInput").val(`${selected.firstName} ${selected.lastName}`);
+  // Set the email field value to the selected student's email
+  $("#studentEmail").val(selected.email);
+}
+
+$(document).ready(function() {
+  $("#searchStudentsInput").on("input", function() {
+    console.log("Input event triggered");
+    searchUser("searchStudentsInput", callback);
+  });
+
+  $("#searchIcon").click(function (e) {
+    e.preventDefault();
+    console.log("Search icon clicked");
+    // Here, you might need to manually get the selected value and set it
+    let selected = { firstName: $("#searchStudentsInput").val().split(" ")[0], lastName: $("#searchStudentsInput").val().split(" ")[1] };
+    callback(selected);
+  });
+});
+
+$("input[name='experienceType']").on("change", function() {
+  toggleOtherExperienceTextarea();
+});
+
+$("input[name='experienceHoursOver300']").on("change", function() {
+  toggleTextarea();
+});
+
+function toggleTextarea() {
+var yesRadio = document.getElementById('yes300hours');
+var textareaContainer = document.getElementById('hoursBelow300Container');
+if (yesRadio.checked) {
+  textareaContainer.style.display = 'none';
+} else {
+  textareaContainer.style.display = 'block';
+}
+}
+
+function toggleOtherExperienceTextarea() {
+var otherRadio = document.getElementById('otherExperience');
+var textareaContainer = document.getElementById('otherExperienceDescription');
+if (otherRadio.checked) {
+  textareaContainer.style.display = 'block';
+} else {
+  textareaContainer.style.display = 'none';
+}
+}
\ No newline at end of file
diff --git a/app/templates/admin/searchStudentPage.html b/app/templates/admin/searchStudentPage.html
index 6916ce652..cf3af8987 100644
--- a/app/templates/admin/searchStudentPage.html
+++ b/app/templates/admin/searchStudentPage.html
@@ -6,9 +6,7 @@
 <script type="module" src="/static/js/searchStudent.js"></script>
 {% endblock %}
 
-{% block styles %}
-  {{super()}}
-{% endblock %}
+
 
 {% block app_content %}
 <form id= "searchStudent" action="/userProfile" method="post">
diff --git a/app/templates/base.html b/app/templates/base.html
index a5e7d7fd0..9f1b27954 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -97,6 +97,14 @@
   <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
   <script src="{{url_for('static', filename='js/bootstrap.bundle.min.js') }}?u={{lastStaticUpdate}}" type="text/javascript"></script>
   <script src="{{url_for('static', filename='js/base.js') }}?u={{lastStaticUpdate}}" type="text/javascript"></script>
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
+
 {% endblock %}
 
 </html>
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index ad9471e21..25683c9ac 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -5,6 +5,7 @@
   {{ super() }}
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
   <script type="text/javascript" src="{{ url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate }}"></script>
+  <script type="module" src="{{ url_for('static', filename='js/profile.js') }}"></script>
 {% endblock %}
 
 {% block styles %}
@@ -87,295 +88,288 @@ <h2>You have not participated in any service learning events or courses.</h2>
       </div>
       <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="trainingEvents">
         <div name="Community-Engaged Summer Experience" class="pt-4">
-          <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor_bp.addSummerExperience', username=user.username) }}" method="POST">
+          <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor.addSummerExperience', username=user.username) }}" method="POST">
             <div class='row'>
               <div class="container">
                 <div class='form-group mb-4 text-center'>
-                  <h3 class='form-label' for='studentUser' style="color: #000000;">COMMUNITY AND CIVIC ENGAGEMENT MINOR (CCE)</h3>
+                  <h3 class='form-label' style="color: #000000;">COMMUNITY AND CIVIC ENGAGEMENT MINOR (CCE)</h3>
                   <h4>Proposal for Community-Engaged Summer Experience</h4>
                   <p>
                     The minor requires an Intensive Community-Engaged Summer Experience that is focused on work that more deeply explores at least one of the four following key content areas: power and inequality, community and identity, civic literacy, or civic skills. Please fill out the following form and return to your CCE Minor Advisor for approval.
                   </p>
                 </div>
-      
+          
                 <div class="form-group">
                   <br>
                   <h4> Student Information </h4>
                   <hr>
                 </div>
-      
+          
                 <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="studentName"> <strong>Student Name</strong> </label>
-                    <input class="form-control name-input" id="studentName" name="studentName" value="{{ user.fullName }}" />
+                    <label class="form-label"><strong>Student Name</strong></label>
+                    <div class="input-group">
+                      <input type="text" id="searchStudentsInput" name="studentName" class="form-control" placeholder="Student's Name" autocomplete="off" />
+                    </div>
                   </div>
                   <div class="form-group col-6">
-                    <label class="form-label" for="studentEmail"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="studentEmail" name="studentEmail" value="{{ user.email }}" />
+                    <label class="form-label"><strong>Email</strong></label>
+                    <input class="form-control" id="studentEmail" placeholder="Student's email" name="studentEmail" value="" />
                     <br>
                   </div>
                 </div>
-      
+          
                 <div class="row">
                   <div class="form-group col-md-6">
                     <label class="form-label me-2" for="date"><strong>Today's Date</strong></label>
                     <br>
-                    <input type="date" id="date" name="date">
+                    <input type="date" id="date" name="date" required>
                   </div>
                 </div>
-      
+          
                 <div class="form-group">
                   <br>
                   <h4> Company/Organization Information </h4>
                   <hr>
                 </div>
-      
+          
                 <div class="form-group">
-                  <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-                  <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company" />
+                  <label class="form-label" for="company"><strong>Name</strong></label>
+                  <input class="form-control" id="company" placeholder="Company or organization's name" name="company" required/>
                 </div>
-      
+          
                 <br>
-      
+          
                 <div class="form-group">
-                  <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-                  <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" />
+                  <label class="form-label" for="companyAddress"><strong>Address</strong></label>
+                  <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" required/>
                 </div>
-      
+          
                 <br>
-      
+          
                 <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" />
+                    <label class="form-label" for="companyPhone"><strong>Phone Number</strong></label>
+                    <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" required/>
                   </div>
                   <div class="form-group col-6">
-                    <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-                    <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" />
+                    <label class="form-label" for="companyWebsite"><strong>Website</strong></label>
+                    <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" required/>
                   </div>
                 </div>
-      
+          
                 <br> 
-      
+          
                 <div class="form-group">
                   <br>
                   <h4> Supervisor Information </h4>
                   <hr>
                 </div>
-      
+          
                 <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" />
+                    <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
+                    <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" required/>
                   </div>
                   <div class="form-group col-6">
-                    <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" />
+                    <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
+                    <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" required/>
                     <br>
                   </div>
                 </div>
-      
+          
                 <div class="form-group">
                   <br>
-                  <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector) that is responsive to community-identified initiatives or needs:</strong></label> <br>
-                  <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Please describe your experience" required></textarea>
-                
-                  <br><br>
+                  <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
+                    Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector)
+                    that is responsive to community-identified initiatives or needs:</strong></label>
+                  <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Enter your role description" required></textarea><br>
+                </div>
                 
+                <div class="form-group">
                   <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please check one.</strong></label><br>
-                  <input type="checkbox" id="internship" name="experienceType" value="Internship">
+                  <input type="radio" id="internship" name="experienceType" value="Internship" required>
                   <label for="internship">Internship</label><br>
-                
-                  <input type="checkbox" id="cbr" name="experienceType" value="Community-based research">
+                  <input type="radio" id="cbr" name="experienceType" value="Community-based research">
                   <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
-                
-                  <input type="checkbox" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
+                  <input type="radio" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
                   <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
-                
-                  <input type="checkbox" id="epgInternship" name="experienceType" value="EPG Summer Internship">
+                  <input type="radio" id="epgInternship" name="experienceType" value="EPG Summer Internship">
                   <label for="epgInternship">EPG Summer Internship</label><br>
-                
-                  <input type="checkbox" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
-                  <label for="bonnerService">Bonner Scholar Summer of Service</label><br>
-                
-                  <input type="checkbox" id="otherExperience" name="experienceType" value="Other">
+                  <input type="radio" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
+                  <label for="bonnerService">Bonner Scholar Summer of Service</label>
+                  <br>
+                  <input type="radio" id="otherExperience" name="experienceType" value="Other" required>
                   <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
-                  <textarea class="form-control" rows="2" cols="72" id="experienceDescription" name="experienceDescription" placeholder="Please describe your summer experience" required></textarea>
-                
-                  <br><br>
+                  <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" placeholder="Enter your summer experience" style="display:none;"></textarea><br>
+                </div>
                 
+                <div class="form-group">
                   <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please check all that apply.</strong></label><br>
                   <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
                   <label for="powerInequality">Power and inequality</label><br>
-                
                   <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
                   <label for="communityIdentity">Community and identity</label><br>
-                
                   <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
                   <label for="civicLiteracy">Civic literacy</label><br>
-                
                   <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
-                  <label for="civicSkills">Civic skills</label>
-                
-                  <br><br>
-                
-                  <label><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks with a public-facing organization?</strong></label><br>
-                  <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes">
-                  <label for="yes300hours">Yes</label>
+                  <label for="civicSkills">Civic skills</label><br><br>
+                </div>
                 
-                  <input type="radio" id="no300hours" name="experienceHoursOver300" value="No">
+                <div class="form-group">
+                  <label for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
+                  <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" onclick="toggleTextarea()">
+                  <label for="yes300hours">Yes</label><br>
+                  <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" onclick="toggleTextarea()">
                   <label for="no300hours">No</label>
+                  <div id="hoursBelow300Container" style="display:none;">
+                    <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks if less than 300" required></textarea>
+                  </div>
+                </div>
                 
-                  <br><br>
-                
-                  <label for="experienceHoursBelow300"><strong>If no, how many hours over how many weeks will you spend engaged in this summer experience?</strong></label>
-                  <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks" required></textarea>
                 
-                  <br><br>
+                <br><br>
                 
-                  {% if filepaths %}
-                  <div class="form-group col-md-4 mb-4">
-                    {% from 'displayFilesMacro.html' import displayFiles %}
-                    {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
-                    {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
-                  </div>
-                  {% endif %}
-    
+                {% if filepaths %}
+                <div class="form-group col-md-4 mb-4">
+                  {% from 'displayFilesMacro.html' import displayFiles %}
+                  {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+                </div>
+                {% endif %}
+          
                 <div class="text-center">
                   <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
                 </div>
               </div>
             </div>
-          </div>
-        </form> 
+          </form>
+           
+        </div>
       </div>
-    </div>
-    <div class="tab-pane fade {{ 'active' if activetab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
-      <form id='requestothercommeng' enctype="multipart/form-data" role='form' action="{{request.path}}" method="post">
-        <div class='row'>
-          <div class="container text-center">
-            <div class='form-group mb-4'>
-              <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
-              <input type="hidden" value="{{user}}" name="user"/>
+      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
+        <form id='requestothercommeng' enctype="multipart/form-data" role='form' action="{{ request.path }}" method="post">
+          <div class='row'>
+            <div class="container text-center">
+              <div class='form-group mb-4'>
+                <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
+                <input type="hidden" value="{{ user }}" name="user"/>
+              </div>
             </div>
-          </div>
 
-          <div class="form-group">
-            <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
-            <select class="form-select" name="term" id="inputTerm" required>
-              {% for term in terms %}   
-              <option value="{{term}}">{{term.description}}</option>
-              {% endfor %}
-            </select>
-          </div>
+            <div class="form-group">
+              <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
+              <select class="form-select" name="term" id="inputTerm" required>
+                {% for term in terms %}   
+                <option value="{{ term }}">{{ term.description }}</option>
+                {% endfor %}
+              </select>
+            </div>
 
-          <br><br><br><br>
+            <br><br><br><br>
 
-          <div class="from-group">
-            <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
-            <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
-          </div>
+            <div class="form-group">
+              <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
+              <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
+            </div>
 
-          <br><br><br><br>
+            <br><br><br><br>
 
-          <div class="form-group">
-            <br>
-            <h4> Company/Organization Information </h4>
-            <hr>
-          </div>
+            <div class="form-group">
+              <br>
+              <h4> Company/Organization Information </h4>
+              <hr>
+            </div>
 
-          <div class="form-group">
-            <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-            <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
-          </div>
+            <div class="form-group">
+              <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
+              <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
+            </div>
 
-          <br>
+            <br>
 
-          <div class="form-group">
-            <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-            <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
-          </div>
+            <div class="form-group">
+              <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
+              <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
+            </div>
 
-          <br>
+            <br>
 
-          <div class="row">
-            <div class="form-group col-6">
-              <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-              <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+            <div class="row">
+              <div class="form-group col-6">
+                <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
+                <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+              </div>
+              <div class="form-group col-6">
+                <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
+                <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+              </div>
             </div>
 
-            <div class="form-group col-6">
-              <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-              <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+            <br> 
+
+            <div class="form-group">
+              <br>
+              <h4> Supervisor Information </h4>
+              <hr>
             </div>
-          </div>
 
-          <br> 
+            <div class="row">
+              <div class="form-group col-6">
+                <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
+                <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
+              </div>
+              <div class="form-group col-6">
+                <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
+                <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+              </div>
+            </div>
 
-          <div class="form-group">
             <br>
-            <h4> Supervisor Information </h4>
-            <hr>
-          </div>
-
-          <div class="row">
-            <div class="form-group col-6">
-              <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-              <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
-            </div>
 
-            <div class="form-group col-6">
-              <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-              <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+            <div class="form-group">
+              <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
+              <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
             </div>
-          </div>
 
-          <br>
+            <br>
 
-          <div class="form-group">
-            <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
-            <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
-          </div>
+            <div class="form-group">
+              <br>
+              <h4> Experience Information </h4>
+              <hr>
+            </div>
 
-          <br>
+            <div class="form-group">
+              <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
+              <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
+            </div>
 
-          <div class="form-group">
             <br>
-            <h4> Experience Information </h4>
-            <hr>
-          </div>
 
-          <div class="form-group">
-            <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
-            <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
-          </div>
-
-          <br>
+            <div class="form-group">
+              <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
+              <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
+            </div>
 
-          <div class="form-group">
-            <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
-            <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
-          </div>
+            <br>
 
-          <br>
+            <div class="form-group">
+              <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
+              <textarea class="form-control" rows="5" cols="72" id="experienceDescription" type="text" placeholder="Please describe your experience" name="description" required></textarea>
+              <br>
+            </div>
 
-          <div class="form-group">
-            <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
-            <textarea class="form-control" rows="5" cols="72" id="experienceDescription" name="description" placeholder="Please describe your experience" required></textarea>
-            <br>
-          </div>
+            {% if filepaths %}
+            <div class="form-group col-md-4 mb-4">
+              {% from 'displayFilesMacro.html' import displayFiles %}
+              {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+            </div>
+            {% endif %}
 
-          {% if filepaths %}
-          <div class="form-group col-md-4 mb-4">
-            {% from 'displayFilesMacro.html' import displayFiles %}
-            {# this call to deleteRequestFiles won't work. Fix when this becomes relevant #}
-            {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+            <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
           </div>
-          {% endif %}
-
-          <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
-        </div>
-      </form>
+        </form>
+      </div>
     </div>
   </div>
 {% endblock %}
diff --git a/database/migrate_db.sh b/database/migrate_db.sh
index a81f759ac..fe5e8e636 100755
--- a/database/migrate_db.sh
+++ b/database/migrate_db.sh
@@ -70,6 +70,7 @@ pem add app.models.eventRsvpLog.EventRsvpLog
 pem add app.models.celtsLabor.CeltsLabor
 pem add app.models.communityEngagementRequest.CommunityEngagementRequest
 pem add app.models.individualRequirement.IndividualRequirement
+pem add app.models.summerExperience.SummerExperience
 
 
 pem watch

From eeb1dc51ccabfe8c67019ece0fed85c22d5204aa Mon Sep 17 00:00:00 2001
From: Eun Sung Wang <156254694+esw0624@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:44:18 -0400
Subject: [PATCH 09/16] Updating to GitHub 2

---
 app/templates/minor/profile.html | 132 -------------------------------
 1 file changed, 132 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index ece48aec4..b4944b660 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -107,7 +107,6 @@ <h4> Student Information </h4>
           
                 <div class="row">
                   <div class="form-group col-6">
-<<<<<<< HEAD
                     <label class="form-label"><strong>Student Name</strong></label>
                     <div class="input-group">
                       <input type="text" id="searchStudentsInput" name="studentName" class="form-control" placeholder="Student's Name" autocomplete="off" />
@@ -116,14 +115,6 @@ <h4> Student Information </h4>
                   <div class="form-group col-6">
                     <label class="form-label"><strong>Email</strong></label>
                     <input class="form-control" id="studentEmail" placeholder="Student's email" name="studentEmail" value="" />
-=======
-                    <label class="form-label" for="fullName"> <strong>Student Name</strong> </label>
-                    <input class="form-control name-input" id="fullName" name="fullName" value="{{ user.fullName }}" />
-                  </div>
-                  <div class="form-group col-6">
-                    <label class="form-label" for="email"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="email" name="email" value="{{ user.email }}" />
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                     <br>
                   </div>
                 </div>
@@ -132,11 +123,7 @@ <h4> Student Information </h4>
                   <div class="form-group col-md-6">
                     <label class="form-label me-2" for="dateCreated"><strong>Today's Date</strong></label>
                     <br>
-<<<<<<< HEAD
                     <input type="date" id="date" name="date" required>
-=======
-                    <input type="date" id="dateCreated" name="dateCreated">
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                   </div>
                 </div>
           
@@ -147,46 +134,27 @@ <h4> Company/Organization Information </h4>
                 </div>
           
                 <div class="form-group">
-<<<<<<< HEAD
                   <label class="form-label" for="company"><strong>Name</strong></label>
                   <input class="form-control" id="company" placeholder="Company or organization's name" name="company" required/>
-=======
-                  <label class="form-label" for="company"> <strong>Name</strong> </label>
-                  <input class="form-control" id="company" name="company" placeholder="Company or organization's name" />
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                 </div>
           
                 <br>
           
                 <div class="form-group">
-<<<<<<< HEAD
                   <label class="form-label" for="companyAddress"><strong>Address</strong></label>
                   <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" required/>
-=======
-                  <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-                  <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" />
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                 </div>
           
                 <br>
           
                 <div class="row">
                   <div class="form-group col-6">
-<<<<<<< HEAD
                     <label class="form-label" for="companyPhone"><strong>Phone Number</strong></label>
                     <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" required/>
                   </div>
                   <div class="form-group col-6">
                     <label class="form-label" for="companyWebsite"><strong>Website</strong></label>
                     <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" required/>
-=======
-                    <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" />
-                  </div>
-                  <div class="form-group col-6">
-                    <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-                    <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" />
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                   </div>
                 </div>
           
@@ -200,21 +168,12 @@ <h4> Supervisor Information </h4>
           
                 <div class="row">
                   <div class="form-group col-6">
-<<<<<<< HEAD
                     <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
                     <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" required/>
                   </div>
                   <div class="form-group col-6">
                     <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
                     <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" required/>
-=======
-                    <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-                    <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" />
-                  </div>
-                  <div class="form-group col-6">
-                    <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-                    <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" />
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
                     <br>
                   </div>
                 </div>
@@ -283,7 +242,6 @@ <h4> Supervisor Information </h4>
                 </div>
               </div>
             </div>
-<<<<<<< HEAD
           </form>
            
         </div>
@@ -412,96 +370,6 @@ <h4> Experience Information </h4>
           </div>
         </form>
       </div>
-=======
-          </div>
-        </form> 
-      </div>
-    </div>
-    <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
-      <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor_bp.addSummerExperience', username=user.username) }}" method="POST">
-        <!-- Form fields here -->
-        <div class="form-group">
-            <label class="form-label" for="fullName"> <strong>Student Name</strong> </label>
-            <input class="form-control name-input" id="fullName" name="fullName" value="{{ user.fullName }}" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="email"> <strong>Email</strong> </label>
-            <input class="form-control email-input" id="email" name="email" value="{{ user.email }}" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="dateCreated"><strong>Today's Date</strong></label>
-            <input type="date" id="dateCreated" name="dateCreated">
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="company"> <strong>Name</strong> </label>
-            <input class="form-control" id="company" name="company" placeholder="Company or organization's name" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-            <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-            <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-            <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="supervisorPhone"> <strong>Supervisor Phone Number</strong> </label>
-            <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" />
-        </div>
-        <div class="form-group">
-            <label class="form-label" for="supervisorEmail"> <strong>Supervisor Email</strong> </label>
-            <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" />
-        </div>
-        <div class="form-group">
-            <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience:</strong></label>
-            <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Please describe your experience" required></textarea>
-        </div>
-        <div class="form-group">
-            <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please check one.</strong></label><br>
-            <input type="checkbox" id="internship" name="experienceType" value="Internship">
-            <label for="internship">Internship</label><br>
-            <input type="checkbox" id="cbr" name="experienceType" value="Community-based research">
-            <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
-            <input type="checkbox" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
-            <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
-            <input type="checkbox" id="epgInternship" name="experienceType" value="EPG Summer Internship">
-            <label for="epgInternship">EPG Summer Internship</label><br>
-            <input type="checkbox" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
-            <label for="bonnerService">Bonner Scholar Summer of Service</label><br>
-            <input type="checkbox" id="otherExperience" name="experienceType" value="Other">
-            <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
-            <textarea class="form-control" rows="2" cols="72" id="experienceDescription" name="experienceDescription" placeholder="Please describe your summer experience" required></textarea>
-        </div>
-        <div class="form-group">
-            <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please check all that apply.</strong></label><br>
-            <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
-            <label for="powerInequality">Power and inequality</label><br>
-            <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
-            <label for="communityIdentity">Community and identity</label><br>
-            <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
-            <label for="civicLiteracy">Civic literacy</label><br>
-            <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
-            <label for="civicSkills">Civic skills</label>
-        </div>
-        <div class="form-group">
-            <label><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks with a public-facing organization?</strong></label><br>
-            <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes">
-            <label for="yes300hours">Yes</label>
-            <input type="radio" id="no300hours" name="experienceHoursOver300" value="No">
-            <label for="no300hours">No</label>
-        </div>
-        <div class="form-group">
-            <label for="experienceHoursBelow300"><strong>If no, how many hours over how many weeks will you spend engaged in this summer experience?</strong></label>
-            <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks" required></textarea>
-        </div>
-        <input class="btn btn-primary" type="submit" value="Send Request for Approval" />
-    </form>
-    
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
     </div>
   </div>
 {% endblock %}

From 3ada839c45d2626f9a10f11f25ef1a9fb7685690 Mon Sep 17 00:00:00 2001
From: jahatehs <jahatehs@berea.edu>
Date: Tue, 23 Jul 2024 09:46:17 -0400
Subject: [PATCH 10/16] Completed the backend for both Summer Experience and
 Other Engagement forms. Also implemented an 'Edt' and 'Withdraw'
 functionality for both forms.

---
 app/controllers/minor/routes.py  | 292 +++++++++----
 app/logic/minor.py               |  47 ++-
 app/models/otherExperience.py    |   2 +
 app/models/summerExperience.py   |  45 +-
 app/static/js/profile.js         | 249 +++++++++--
 app/templates/minor/profile.html | 696 ++++++++++++++++++++-----------
 database/migrate_db.sh           |   1 +
 7 files changed, 907 insertions(+), 425 deletions(-)

diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index 0535aa90d..7689096f2 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -1,63 +1,188 @@
-from flask import g, render_template, request, abort, flash, redirect, url_for
+from flask import g, render_template, request, abort, flash, redirect, url_for, jsonify
 from peewee import DoesNotExist
 
 from app.controllers.minor import minor_bp
 from app.models.user import User
 from app.models.term import Term
-from app.models.attachmentUpload import AttachmentUpload
+from app.models.summerExperience import SummerExperience
+from app.models.otherExperience import OtherExperience
 
 from app.logic.fileHandler import FileHandler
 from app.logic.utils import selectSurroundingTerms, getFilesFromRequest
 from app.logic.minor import getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm, removeSummerExperience
-from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal, createSummerExperience
+from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal, createSummerExperience, createOtherEngagement
+import logging
 
 
+# ################################################## SUMMER EXPERIENCE START ###########################################################
 
-<<<<<<< HEAD
-=======
-# ##################################################################################
-# /profile/<username>/cceMinor
-@minor_bp.route('/profile/<username>/cceMinorr', methods=['POST', 'GET']) 
-def addSummerExperience(username):
+@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+def addASummerExperience(username):
+    try:
+        createSummerExperience(username, request.form)
+        flash(f'Summer Experience added successfully by {username}', 'success')
+        return redirect(url_for('minor.viewProposal', username=username, activeTab='trainingEvents'))
+    except Exception as e:
+        flash(f'An error occurred while adding the summer experience: {e}', 'danger')
+        logging.error(f'An error occurred while adding the summer experience: {e}')
+    return redirect(url_for('minor.viewCceMinor', username=username))
+
+
+
+@minor_bp.route('/cceMinor/<username>/viewProposal', methods=['GET'])
+def viewProposal(username):
+    try:
+        user = User.get(User.username == username)
+        try:
+            summer_experience = (SummerExperience
+                                 .select()
+                                 .where(SummerExperience.user == user)
+                                 .order_by(SummerExperience.id.desc())
+                                 .get())
+        except SummerExperience.DoesNotExist:
+            summer_experience = None  # No summer experience found
+
+        return render_template('minor/profile.html', user=user, summer_experience=summer_experience, activeTab='trainingEvents')
+   
+    except Exception as e:
+        flash(f"Error retrieving proposal: {e}", 'danger')
+        return redirect(url_for('minor.viewCceMinor', username=username))
+
+
+
+
+@minor_bp.route('/profile/<username>/withdrawSummerExperience', methods=['POST'])
+def withdrawSummerExperience(username):
+    try:
+        user = User.get(User.username == username)
+        experience_id = request.form.get('experience_id')
+        
+        summer_experience = SummerExperience.get(SummerExperience.id == experience_id, SummerExperience.user == user)
+        summer_experience.delete_instance()
+        
+        flash('Summer experience proposal withdrawn successfully.', 'success')
+        return jsonify({'status': 'success', 'message': 'Summer experience proposal withdrawn successfully.'})
+    except Exception as e:
+        logging.error(f"Error withdrawing summer experience: {e}")
+        flash('An error occurred while withdrawing the proposal.', 'danger')
+        return jsonify({'status': 'error', 'message': 'An error occurred while withdrawing the proposal.'}), 500
+
+
+
+
+@minor_bp.route('/cceMinor/<username>/updateSummerExperience', methods=['GET', 'POST'])
+def updateSummerExperience(username):
+    try:
+        form_data = request.form
+        user = User.get(User.username == username)
+        experience_id = form_data['experience_id']
+        summer_experience = SummerExperience.get(SummerExperience.id == experience_id)
+
+        content_area = ', '.join(form_data.getlist('contentArea'))
+        experience_type = form_data['experienceType']
+        if experience_type == 'Other':
+            other_experience_description = form_data.get('otherExperienceDescription', '')
+            if not other_experience_description:
+                raise ValueError("Other experience description is required.")
+            experience_type = other_experience_description
+
+        summer_experience.studentName = form_data['studentName']
+        summer_experience.summerYear = form_data['summerYear']
+        summer_experience.roleDescription = form_data['roleDescription']
+        summer_experience.experienceType = experience_type
+        summer_experience.CceMinorContentArea = content_area
+        summer_experience.experienceHoursOver300 = form_data['experienceHoursOver300'] == 'Yes'
+        summer_experience.experienceHoursBelow300 = form_data.get('experienceHoursBelow300')
+        summer_experience.company = form_data['company']
+        summer_experience.companyAddress = form_data['companyAddress']
+        summer_experience.companyPhone = form_data['companyPhone']
+        summer_experience.companyWebsite = form_data['companyWebsite']
+        summer_experience.supervisorName = form_data['directSupervisor']
+        summer_experience.supervisorPhone = form_data['supervisorPhone']
+        summer_experience.supervisorEmail = form_data['supervisorEmail']
+        summer_experience.save()
+
+        flash("Proposal updated successfully.", 'success')
+        return redirect(url_for('minor.viewProposal', username=username))
+    except Exception as e:
+        flash(f"Error updating proposal: {e}", 'danger')
+        return redirect(url_for('minor.viewProposal', username=username))
+
+
+# ################################################## SUMMER EXPERIENCE END ###########################################################
+@minor_bp.route('/cceMinor/<username>/addOtherEngagement', methods=['POST'])
+def addOtherEngagement(username):
+    try:
+        form_data = request.form
+        # Process form data and create a new OtherExperience
+        new_experience = OtherExperience.create(
+            user=User.get(User.username == username),
+            activity=form_data['experienceName'],
+            term=Term.get(Term.id == form_data['term']),
+            hours=form_data['totalHours'],
+            weeks=form_data['weeks'],
+            service=form_data['description'],
+            company=form_data['companyOrOrg']
+            # Add other fields as needed
+        )
+        flash('Other Community Engaged Experience added successfully!', 'success')
+        return redirect(url_for('minor.view_other_engagement', username=username))
+    except Exception as e:
+        flash(f'An error occurred while adding the engagement: {e}', 'danger')
+        logging.error(f'An error occurred while adding the engagement: {e}', exc_info=True)
+        return redirect(url_for('minor.view_other_engagement', username=username))
+
+@minor_bp.route('/cceMinor/<username>/otherEngagement', methods=['GET'])
+def view_other_engagement(username):
     user = User.get(User.username == username)
-    summer_experience_data = {
-        'user': user,
-        'fullName': request.form['fullName'],
-        'email': request.form['studentEmail'],
-        # All other fields from the form
-        'roleDescription': request.form['roleDescription'],
-        'experienceType': request.form['experienceType'],
-        'contentArea': request.form.getlist('contentArea'),
-        'experienceHoursOver300': request.form['experienceHoursOver300'] == 'Yes',
-        'experienceHoursBelow300': request.form['experienceHoursBelow300'],
-        'dateCreated': request.form['dateCreated'],
-        'company': request.form['company'],
-        'companyAddress': request.form['companyAddress'],
-        'companyPhone': request.form['companyPhone'],
-        'companyWebsite': request.form['companyWebsite'],
-        'supervisorPhone': request.form['supervisorPhone'],
-        'supervisorEmail': request.form['supervisorEmail'],
-        'totalHours': request.form['totalHours'],
-        'weeks': request.form['weeks'],
-        'description': request.form['description'],
-        'filename': request.form['filename'],
-        'status': 'Pending'  # or however you want to set the initial status
-    }
-    print("test", summer_experience_data)
-    
-    saveSummerExperience(summer_experience_data)
+    try:
+        other_experience = OtherExperience.get(OtherExperience.user == user)
+    except OtherExperience.DoesNotExist:
+        other_experience = None
+    return render_template('minor/profile.html', user=user, other_experience=other_experience)
 
-    return render_template("minor/profile.html")
-    
-    # return redirect(url_for('minor_bp.viewCceMinor', username=username))
 
 
-def addSummerExperience(username):
-    saveSummerExperience(username, request.form, g.current_user)
 
-    return ""
-#######################################################################################
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
+@minor_bp.route('/api/terms', methods=['GET'])
+def get_terms():
+    terms = Term.select()
+    term_list = [{'id': term.id, 'name': term.description} for term in terms]
+    return jsonify(term_list)
+
+
+@minor_bp.route('/withdrawOtherExperience/<int:experience_id>', methods=['POST'])
+def withdraw_other_experience(experience_id):
+    try:
+        experience = OtherExperience.get(OtherExperience.id == experience_id)
+        experience.delete_instance()
+        return jsonify({'status': 'success', 'message': 'Experience withdrawn successfully.'})
+    except Exception as e:
+        logging.error(f"Error withdrawing other experience: {e}", exc_info=True)
+        return jsonify({'success': False, 'An error occured while withrawing experience.': str(e)}), 500
+
+@minor_bp.route('/cceMinor/<username>/editOtherEngagement', methods=['POST'])
+def edit_other_engagement(username):
+    try:
+        form_data = request.form
+        experience_id = form_data['experience-id']
+        experience = OtherExperience.get(OtherExperience.id == experience_id)
+        
+        experience.activity = form_data['experienceName']
+        experience.term = Term.get(Term.id == form_data['term'])
+        experience.hours = form_data['totalHours']
+        experience.weeks = form_data['weeks']
+        experience.service = form_data['description']
+        experience.company = form_data['companyOrOrg']
+        experience.save()
+        
+        flash(f'Engagement updated successfully by {username}', 'success')
+    except Exception as e:
+        flash(f'An error occurred while updating the engagement: {e}', 'danger')
+        logging.error(f'An error occurred while updating the engagement: {e}', exc_info=True)
+    return redirect(url_for('minor.viewCceMinor', username=username))
+
+# ###############################################################################
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
@@ -70,57 +195,16 @@ def viewCceMinor(username):
     sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
     selectedSummerTerm, summerExperience = getSummerExperience(username)
 
-    terms = selectSurroundingTerms(g.current_term)
     return render_template("minor/profile.html",
                             user = User.get_by_id(username),
                             sustainedEngagementByTerm = sustainedEngagementByTerm,
                             summerExperience = summerExperience if summerExperience else "",
                             selectedSummerTerm = selectedSummerTerm,
                             totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
-                            summerTerms = getSummerTerms(), terms=terms) 
-
-
-# ########################################################################################
-from flask import request, redirect, url_for, flash
-from app.models.summerExperience import SummerExperience
-from app.models.user import User
-from app.models.term import Term
-from app.controllers.minor import minor_bp
-
-@minor_bp.route('/profile/<username>/addSummerExperience', methods=['POST'])
-def addSummerExperience(username):
-    try:
-        user = User.get(User.username == username)
-        term = Term.get(Term.id == request.form['term'])
-        
-        experience_type = request.form['experienceType']
-        if experience_type == 'Other':
-            experience_type = request.form.get('otherExperienceDescription', '')
-
-        SummerExperience.create(
-            user=user,
-            term=term,
-            roleDescription=request.form['roleDescription'],
-            experienceType=experience_type,
-            CceMinorContentArea=', '.join(request.form.getlist('contentArea')),
-            experienceHoursOver300=request.form['experienceHoursOver300'] == 'Yes',
-            experienceHoursBelow300=request.form.get('experienceHoursBelow300', ''),
-            status='Pending',
-            company=request.form['company'],
-            companyAddress=request.form['companyAddress'],
-            companyPhone=request.form['companyPhone'],
-            companyWebsite=request.form['companyWebsite'],
-            supervisorPhone=request.form['supervisorPhone'],
-            supervisorEmail=request.form['supervisorEmail'],
-            created_at=datetime.datetime.now()
-        )
-        flash('Summer Experience added successfully!', 'success')
-    except Exception as e:
-        flash(f'An error occurred while adding the summer experience: {e}', 'danger')
-    return redirect(url_for('minor.viewCceMinor', username=username))
-
-# ########################################################################################
+                            summerTerms = getSummerTerms(),
+                            allTerms = getSummerExperience(username))
 
+    
 
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
@@ -150,9 +234,41 @@ def modifyCommunityEngagement(username):
     
     return ""
 
+@minor_bp.route('/cceMinor/<username>/requestOtherCommunityEngagement', methods=['GET', 'POST'])
+def requestOtherEngagement(username):
+    """
+        Load the "request other" form and submit it.
+    """
+    user = User.get_by_id(username)
+    terms = selectSurroundingTerms(g.current_term)
+    
+
+    if request.method == 'POST':
+        filename = None
+        attachment = request.files.get("attachmentObject")
+        if attachment:
+                addFile = FileHandler(getFilesFromRequest(request))
+                addFile.saveFiles()
+                filename = attachment.filename
+        formData = request.form.copy()
+        formData["filename"] = filename
+        saveOtherEngagementRequest(formData)
+        flash("Other community engagement request submitted.", "success")
+        return redirect(url_for("minor.viewCceMinor", username=user))
+
+
+    return render_template("/minor/requestOtherEngagement.html",
+                            user=user,
+                            terms=terms)
+
+# @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+def addSummerExperience(username):
+    saveSummerExperience(username, request.form, g.current_user)
+
+    return ""
 
 @minor_bp.route('/cceMinor/<username>/deleteSummerExperience', methods=['POST'])
 def deleteSummerExperience(username):        
     removeSummerExperience(username)
 
-    return ""
+    return ""
\ No newline at end of file
diff --git a/app/logic/minor.py b/app/logic/minor.py
index 1dfc5b851..eeb7e05de 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -1,5 +1,6 @@
 from collections import defaultdict
 from typing import List, Dict
+from flask import flash
 from playhouse.shortcuts import model_to_dict
 from peewee import JOIN, fn, Case, DoesNotExist
 
@@ -15,18 +16,17 @@
 from app.models.individualRequirement import IndividualRequirement
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.communityEngagementRequest import CommunityEngagementRequest
-from app.models.summerExperience import SummerExperience # Added
-
-
-
-# ###################################################################
+from app.models.summerExperience import SummerExperience
+from app.models.otherExperience import OtherExperience
 import logging
 
+
 def createSummerExperience(username, form_data):
     try:
+        logging.info(f"Form data received: {form_data}")
+
         user = User.get(User.username == username)
-        term = Term.get(Term.id == form_data['term'])
-        content_area = ','.join(form_data.getlist('contentArea'))  # Combine multiple content areas
+        content_area = ', '.join(form_data.getlist('contentArea'))  # Combine multiple content areas
 
         # Determine the experience type
         experience_type = form_data['experienceType']
@@ -38,10 +38,11 @@ def createSummerExperience(username, form_data):
 
         SummerExperience.create(
             user=user,
-            term=term,
+            studentName=form_data['studentName'],
+            summerYear=form_data['summerYear'],
             roleDescription=form_data['roleDescription'],
             experienceType=experience_type,
-            contentArea=content_area,
+            CceMinorContentArea=content_area,
             experienceHoursOver300=form_data['experienceHoursOver300'] == 'Yes',
             experienceHoursBelow300=form_data.get('experienceHoursBelow300'),
             status='Pending',
@@ -49,20 +50,38 @@ def createSummerExperience(username, form_data):
             companyAddress=form_data['companyAddress'],
             companyPhone=form_data['companyPhone'],
             companyWebsite=form_data['companyWebsite'],
+            supervisorName=form_data['directSupervisor'],
             supervisorPhone=form_data['supervisorPhone'],
-            supervisorEmail=form_data['supervisorEmail']
+            supervisorEmail=form_data['supervisorEmail'],
+            created_at=form_data['date']
         )
         logging.info("Summer experience successfully saved.")
-    except DoesNotExist as e:
-        logging.error(f"Error saving summer experience: User or Term not found - {e}")
-        raise
     except Exception as e:
         logging.error(f"Error saving summer experience: {e}")
         raise
 
 
-# ###################################################################
 
+def createOtherEngagement(username, form_data):
+    try:
+        logging.info(f"Form data received: {form_data}")
+        user = User.get(User.username == username)
+        term = Term.get(Term.id == form_data['term'])
+
+        OtherExperience.create(
+            activity=form_data['experienceName'],
+            term=term,
+            hours=form_data['totalHours'],
+            weeks=form_data['weeks'],
+            service=form_data['description'],
+            company=form_data['companyOrOrg']
+        )
+        logging.info("Engagement successfully saved.")
+    except Exception as e:
+        logging.error(f"Error saving engagement: {e}", exc_info=True)
+        raise
+
+# ################################################
 def getEngagementTotal(engagementData):
     """ 
         Count the number of engagements (from all terms) that have matched with a requirement 
diff --git a/app/models/otherExperience.py b/app/models/otherExperience.py
index e0365afe0..eb9c1df38 100644
--- a/app/models/otherExperience.py
+++ b/app/models/otherExperience.py
@@ -1,7 +1,9 @@
 from app.models import *
 from app.models.term import Term
+from app.models.user import User
 
 class OtherExperience(baseModel):
+    user = ForeignKeyField(User)
     activity = CharField()
     term = ForeignKeyField(Term)
     hours = IntegerField()
diff --git a/app/models/summerExperience.py b/app/models/summerExperience.py
index a73974d11..38e7d5426 100644
--- a/app/models/summerExperience.py
+++ b/app/models/summerExperience.py
@@ -1,58 +1,25 @@
 import datetime
 from app.models import *
-<<<<<<< HEAD
-from app.models.term import Term
 from app.models.user import User
 
 class SummerExperience(baseModel):
     user = ForeignKeyField(User)
-    term = ForeignKeyField(Term)
+    studentName = CharField()
+    summerYear = CharField()
     roleDescription = TextField()
-=======
-from app.models.communityEngagementRequest import CommunityEngagementRequest
-from app.models.user import User
-from app.logic.minor import getMinorProgress # might need it
-from peewee import CharField, BooleanField, DateField, ForeignKeyField, Check
-# from app.models.baseModel import BaseModel
-from app.models.user import User
-from app.models.communityEngagementRequest import CommunityEngagementRequest
-
-class SummerExperience(baseModel):
-    user = ForeignKeyField(User, backref='summer_experiences')
-    fullName = CharField()
-    bnumber = CharField()
-    email = CharField()
-    dateCreated = DateField()
-
-    company = CharField()
-    companyAddress = CharField()
-    companyPhone = CharField()
-    companyWebsite = CharField()
-    supervisorPhone = CharField()
-    supervisorEmail = CharField()
-    totalHours = CharField()
-    weeks = CharField()
-    description = CharField()
-    filename = CharField()
-    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")])
-
-    roleDescription = CharField()
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
     experienceType = CharField()
     CceMinorContentArea = TextField()  # Store as comma-separated values or use a related table if needed
     experienceHoursOver300 = BooleanField()
-<<<<<<< HEAD
     experienceHoursBelow300 = CharField(null=True)  # Optional for hours if less than 300
-    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")], default='Pending') # To be checked later. We might need to create a function that validates that status can only be 'Approved' if experienceType is not null.
+    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")], default='Pending')
     company = CharField()
     companyAddress = CharField()
     companyPhone = CharField()
     companyWebsite = CharField()
+    supervisorName = CharField()
     supervisorPhone = CharField()
     supervisorEmail = CharField()
     created_at = DateTimeField(default=datetime.datetime.now)
-=======
-    experienceHoursBelow300 = CharField()
 
- 
->>>>>>> a311d3562b18384d885f5791fe67cfb8d4a59e33
+    class Meta:
+        db_table = 'summerExperience'
diff --git a/app/static/js/profile.js b/app/static/js/profile.js
index 6261cfb5e..38cf2b0de 100644
--- a/app/static/js/profile.js
+++ b/app/static/js/profile.js
@@ -1,11 +1,8 @@
-// app/static/js/profile.js
 import searchUser from './searchUser.js';
 
 function callback(selected) {
   console.log('Selected student:', selected);
-  // Set the input value to the full name
   $("#searchStudentsInput").val(`${selected.firstName} ${selected.lastName}`);
-  // Set the email field value to the selected student's email
   $("#studentEmail").val(selected.email);
 }
 
@@ -17,37 +14,231 @@ $(document).ready(function() {
 
   $("#searchIcon").click(function (e) {
     e.preventDefault();
-    console.log("Search icon clicked");
-    // Here, you might need to manually get the selected value and set it
     let selected = { firstName: $("#searchStudentsInput").val().split(" ")[0], lastName: $("#searchStudentsInput").val().split(" ")[1] };
     callback(selected);
   });
-});
 
-$("input[name='experienceType']").on("change", function() {
-  toggleOtherExperienceTextarea();
-});
+  $("input[name='experienceType']").on("change", function() {
+    toggleOtherExperienceTextarea();
+  });
+
+  $("input[name='experienceHoursOver300']").on("change", function() {
+    toggleTextarea();
+  });
+
+  function toggleTextarea() {
+    var yesRadio = document.getElementById('yes300hours');
+    var textareaContainer = document.getElementById('hoursBelow300Container');
+    if (yesRadio.checked) {
+      textareaContainer.style.display = 'none';
+    } else {
+      textareaContainer.style.display = 'block';
+    }
+  }
+  window.toggleTextarea = toggleTextarea; 
+
+  function toggleOtherExperienceTextarea() {
+    var otherRadio = document.getElementById('otherExperience');
+    var textareaContainer = document.getElementById('otherExperienceDescription');
+    if (otherRadio.checked) {
+      textareaContainer.style.display = 'block';
+    } else {
+      textareaContainer.style.display = 'none';
+    }
+  }
+  window.toggleOtherExperienceTextarea = toggleOtherExperienceTextarea;
+
+  function updateYearOptions() {
+    var submissionDate = new Date(document.getElementById('date').value);
+    var currentYear = submissionDate.getFullYear();
+    var month = submissionDate.getMonth() + 1;
+    var day = submissionDate.getDate();
+    var defaultYear = (month < 5 || (month === 5 && day < 16)) ? currentYear : currentYear + 1;
+
+    var startYear = currentYear - 3;
+    var endYear = currentYear + 2;
+
+    var options = [];
+    for (var year = startYear; year <= endYear; year++) {
+      var option = $("<option>").val(year).text(year);
+      if (year === defaultYear) {
+        option.attr("selected", "selected");
+      }
+      options.push(option);
+    }
+
+    $("#summerYear").empty().append(options);
+  }
+
+  var today = new Date().toISOString().split('T')[0];
+  document.getElementById('date').value = today;
+  updateYearOptions();
+
+  document.getElementById('date').addEventListener('change', updateYearOptions);
+
+  $('#summerExperienceForm').on('submit', function(event) {
+    event.preventDefault(); 
+    var formData = new FormData(this); 
+    var actionUrl = $(this).attr('action'); 
+    
+    $.ajax({
+      url: actionUrl,
+      type: 'POST',
+      data: formData,
+      contentType: false,
+      processData: false,
+      success: function(response) {
+        $('#pills-training').html(response);
+        $('#trainingEvents').tab('show');
+      },
+      error: function(xhr, status, error) {
+        console.error('Error:', error);
+      }
+    });
+  });
+
+  document.getElementById('edit-proposal-button').addEventListener('click', function() {
+    toggleEditMode(true);
+  });
+
+  document.getElementById('cancel-edit-button').addEventListener('click', function() {
+    toggleEditMode(false);
+  });
+
+  function toggleEditMode(isEditMode) {
+    document.querySelectorAll('input, textarea, select').forEach(element => {
+      if (element.type === 'radio' || element.type === 'checkbox' || element.tagName === 'SELECT') {
+        element.disabled = !isEditMode;
+      } else {
+        element.readOnly = !isEditMode;
+      }
+    });
+    document.getElementById('edit-buttons').style.display = isEditMode ? 'block' : 'none';
+    document.getElementById('view-buttons').style.display = isEditMode ? 'none' : 'block';
+  }
 
-$("input[name='experienceHoursOver300']").on("change", function() {
-  toggleTextarea();
+  toggleEditMode(false);
+
+  var withdrawButton = document.getElementById('withdraw-button');
+  var experienceIdElement = document.getElementById('experience-id');
+
+  if (withdrawButton && experienceIdElement) {
+    var experienceId = experienceIdElement.value;
+
+    withdrawButton.addEventListener('click', function(event) {
+      event.preventDefault();
+
+      if (confirm('Are you sure you want to withdraw the proposal?')) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', `/profile/${document.getElementById('username').value}/withdrawSummerExperience`, true);
+        xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+
+        xhr.onload = function() {
+          if (xhr.status === 200) {
+            console.log('Proposal withdrawn successfully');
+            window.location.href = `/cceMinor/${document.getElementById('username').value}/viewProposal`;
+          } else {
+            console.log('Error withdrawing proposal');
+          }
+        };
+
+        xhr.onerror = function() {
+          console.log('Request failed');
+        };
+
+        xhr.send('experience_id=' + encodeURIComponent(experienceId));
+      } else {
+        console.log('User cancelled withdrawal');
+      }
+    });
+  } else {
+    console.log('Withdraw button or experience ID not found');
+  }
 });
 
-function toggleTextarea() {
-var yesRadio = document.getElementById('yes300hours');
-var textareaContainer = document.getElementById('hoursBelow300Container');
-if (yesRadio.checked) {
-  textareaContainer.style.display = 'none';
-} else {
-  textareaContainer.style.display = 'block';
-}
-}
 
-function toggleOtherExperienceTextarea() {
-var otherRadio = document.getElementById('otherExperience');
-var textareaContainer = document.getElementById('otherExperienceDescription');
-if (otherRadio.checked) {
-  textareaContainer.style.display = 'block';
-} else {
-  textareaContainer.style.display = 'none';
-}
-}
\ No newline at end of file
+
+// ////////// js for Requesting Other Engagement //////////
+document.addEventListener('DOMContentLoaded', function() {
+  // Function to get query parameters
+  function getQueryParams() {
+      let params = {};
+      window.location.search.substring(1).split("&").forEach(function(pair) {
+          let [key, value] = pair.split("=");
+          params[key] = value;
+      });
+      return params;
+  }
+
+  // Set the active tab based on the query parameter
+  const params = getQueryParams();
+  if (params.tab === 'otherEngagement') {
+      const otherEngagementTab = document.getElementById('otherEngagementTab'); // Adjust this to your tab element's ID
+      const tabContent = document.getElementById('otherEngagement'); // Adjust this to your tab content's ID
+      otherEngagementTab.classList.add('active');
+      tabContent.classList.add('active', 'show');
+  }
+
+  // Fetch terms and populate the select dropdown
+  fetch('/api/terms')
+      .then(response => {
+          if (!response.ok) {
+              throw new Error('Network response was not ok ' + response.statusText);
+          }
+          return response.json();
+      })
+      .then(data => {
+          const termSelect = document.getElementById('inputTerm');
+          const termId = document.querySelector('form').dataset.termId;
+          data.forEach(term => {
+              const option = document.createElement('option');
+              option.value = term.id;
+              option.textContent = term.name;  // Using 'name' which is actually 'description' in the model
+              termSelect.appendChild(option);
+              if (term.id == termId) {
+                  option.selected = true;
+              }
+          });
+      })
+      .catch(error => console.error('Error fetching terms:', error));
+
+  const editOtherButton = document.getElementById('edit-other-proposal-button');
+  const cancelOtherButton = document.getElementById('cancel-other-edit-button');
+  const withdrawOtherButton = document.getElementById('withdraw-other-button');
+  const otherFormFields = document.querySelectorAll('#requestOtherCommEng input, #requestOtherCommEng select, #requestOtherCommEng textarea');
+
+  editOtherButton.addEventListener('click', function() {
+      otherFormFields.forEach(field => field.removeAttribute('disabled'));
+      document.getElementById('edit-other-buttons').style.display = 'block';
+      document.getElementById('view-other-buttons').style.display = 'none';
+  });
+
+  cancelOtherButton.addEventListener('click', function() {
+      otherFormFields.forEach(field => field.setAttribute('disabled', 'disabled'));
+      document.getElementById('edit-other-buttons').style.display = 'none';
+      document.getElementById('view-other-buttons').style.display = 'block';
+  });
+
+  withdrawOtherButton.addEventListener('click', function() {
+      const experienceId = document.getElementById('other-experience-id').value;
+      if (experienceId && confirm('Are you sure you want to withdraw this proposal?')) {
+          fetch(`/withdrawOtherExperience/${experienceId}?tab=otherEngagement`, {
+              method: 'POST',
+              headers: {
+                  'Content-Type': 'application/json'
+              },
+              body: JSON.stringify({ experienceId: experienceId })
+          })
+          .then(response => response.json())
+          .then(data => {
+              if (data.success) {
+                  alert('Proposal withdrawn successfully.');
+                  window.location.search = "?tab=otherEngagement"; // Update URL to keep the tab
+              } else {
+                  alert('Failed to withdraw the proposal.');
+              }
+          })
+          .catch(error => console.error('Error withdrawing proposal:', error));
+      }
+  });
+});
\ No newline at end of file
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index b4944b660..9be4b1e41 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -6,8 +6,11 @@
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
   <script type="text/javascript" src="{{ url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/profile.js') }}"></script>
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
 {% endblock %}
 
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" href="{{ url_for('static', filename='css/minor.css') }}?u={{ lastStaticUpdate }}">
@@ -16,7 +19,7 @@
 {% block app_content %}
   <div class="row">
     <input id="username" value="{{ user.username }}" hidden />
-    <div name="Header" class="row">
+    <div name="Header" class="row text-center">
       <h1>{{ user.firstName }} {{ user.lastName }}'s CCE Minor Profile</h1>
     </div>
     <div class="row">
@@ -39,7 +42,7 @@ <h1>{{ user.firstName }} {{ user.lastName }}'s CCE Minor Profile</h1>
     </div>
     <div class="tab-content" id="pills-tabContent">
       <div class="tab-pane fade show {{ 'active' if activeTab == 'studentLedEvents' or activeTab is not defined else '' }}" id="pills-student-led" role="tabpanel" aria-labelledby="studentLedEvents">
-        <p class="pt-2">Approximately two hours of engagement over about ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
+        <p class="pt-2">Requires twenty hours of engagement over the ten weeks of a semester. Only two engagement activities can be credited in a single semester.</p>
         <div class="accordion" id="communityEngagement">
           {% if sustainedEngagementByTerm %}
           {% for term, engagements in sustainedEngagementByTerm.items() %}
@@ -86,289 +89,472 @@ <h2>You have not participated in any service learning events or courses.</h2>
           {% endif %}
         </div>
       </div>
-      <div class="tab-pane fade {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="trainingEvents">
+      <div class="tab-pane fade show {{ 'active' if activeTab == 'trainingEvents' else '' }}" id="pills-training" role="tabpanel" aria-labelledby="trainingEvents">
         <div name="Community-Engaged Summer Experience" class="pt-4">
-          <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{{ url_for('minor.addSummerExperience', username=user.username) }}" method="POST">
+          {% if summer_experience %}
+          <!-- Display summer experience details -->
+          <form id='editSummerExperienceForm' enctype="multipart/form-data" role='form' action="{{ url_for('minor.updateSummerExperience', username=user.username) }}" method="POST">
             <div class='row'>
-              <div class="container">
-                <div class='form-group mb-4 text-center'>
-                  <h3 class='form-label' style="color: #000000;">COMMUNITY AND CIVIC ENGAGEMENT MINOR (CCE)</h3>
-                  <h4>Proposal for Community-Engaged Summer Experience</h4>
-                  <p>
-                    The minor requires an Intensive Community-Engaged Summer Experience that is focused on work that more deeply explores at least one of the four following key content areas: power and inequality, community and identity, civic literacy, or civic skills. Please fill out the following form and return to your CCE Minor Advisor for approval.
-                  </p>
-                </div>
-          
-                <div class="form-group">
-                  <br>
-                  <h4> Student Information </h4>
-                  <hr>
-                </div>
-          
-                <div class="row">
-                  <div class="form-group col-6">
-                    <label class="form-label"><strong>Student Name</strong></label>
-                    <div class="input-group">
-                      <input type="text" id="searchStudentsInput" name="studentName" class="form-control" placeholder="Student's Name" autocomplete="off" />
+                <div class="container">
+                    <div class='form-group mb-4 text-center'>
+                        <h4>Proposal for Community-Engaged Summer Experience</h4>
+                        <p>
+                            The minor requires an Intensive Community-Engaged Summer Experience that is focused on work that more deeply explores at least one of the four following key content areas: power and inequality, community and identity, civic literacy, or civic skills.
+                        </p>
                     </div>
-                  </div>
-                  <div class="form-group col-6">
-                    <label class="form-label"><strong>Email</strong></label>
-                    <input class="form-control" id="studentEmail" placeholder="Student's email" name="studentEmail" value="" />
+        
+                    <div class="form-group">
+                        <br>
+                        <h4>Student Information</h4>
+                        <hr>
+                    </div>
+        
+                    <input type="hidden" name="experience_id" value="{{ summer_experience.id }}">
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label"><strong>Student Name</strong></label>
+                            <div class="input-group">
+                                <input type="text" id="studentName" name="studentName" value="{{ summer_experience.studentName }}" class="form-control" placeholder="Student's Name" autocomplete="off" readonly>
+                            </div>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label"><strong>Email</strong></label>
+                            <input class="form-control" id="studentEmail" placeholder="Student's email" name="studentEmail" value="{{ user.email }}" readonly>
+                            <br>
+                        </div>
+                    </div>
+        
+                    <div class="row">
+                        <div class="form-group col-md-6">
+                            <label class="form-label me-2" for="summerYear"><strong>Summer Year</strong></label>
+                            <select class="form-select" id="summerYear" name="summerYear" required>
+                                <option value="" disabled>Select Year</option>
+                                <option value="2023" {% if summer_experience.summerYear == '2023' %}selected{% endif %}>2023</option>
+                                <option value="2024" {% if summer_experience.summerYear == '2024' %}selected{% endif %}>2024</option>
+                                <option value="2025" {% if summer_experience.summerYear == '2025' %}selected{% endif %}>2025</option>
+                            </select>
+                        </div>
+                        <div class="form-group col-md-6">
+                            <label class="form-label me-2" for="dateCreated"><strong>Submission Date</strong></label>
+                            <br>
+                            <input class="form-control" type="date" id="date" name="date" value="{{ summer_experience.created_at }}" required>
+                        </div>
+                    </div>
+        
+                    <div class="form-group">
+                        <br>
+                        <h4>Company/Organization Information</h4>
+                        <hr>
+                    </div>
+        
+                    <div class="form-group">
+                        <label class="form-label" for="company"><strong>Name</strong></label>
+                        <input class="form-control" id="company" name="company" placeholder="Company or organization's name" value="{{ summer_experience.company }}" required>
+                    </div>
+        
+                    <br>
+        
+                    <div class="form-group">
+                        <label class="form-label" for="companyAddress"><strong>Address</strong></label>
+                        <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" value="{{ summer_experience.companyAddress }}" required>
+                    </div>
+        
                     <br>
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label" for="companyPhone"><strong>Phone Number</strong></label>
+                            <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" value="{{ summer_experience.companyPhone }}" required>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label" for="companyWebsite"><strong>Website</strong></label>
+                            <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" value="{{ summer_experience.companyWebsite }}" required>
+                        </div>
+                    </div>
+        
+                    <br> 
+        
+                    <div class="form-group">
+                        <br>
+                        <h4> Supervisor Information </h4>
+                        <hr>
+                    </div>
+        
+                    <div class="row">
+                        <div class="form-group col-12">
+                            <label class="form-label" for="directSupervisor"> <strong>Direct Supervisor Name (or "Yet to be determined")</strong> </label>
+                            <input class="form-control" id="directSupervisor" placeholder="Name of Direct Supervisor" name="directSupervisor" value="{{ summer_experience.supervisorName }}" required>
+                        </div>
+                    </div>
+
+                    <br>
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
+                            <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" value="{{ summer_experience.supervisorPhone }}" required>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
+                            <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" value="{{ summer_experience.supervisorEmail }}" required>
+                            <br>
+                        </div>
+                    </div>
+        
+                    <div class="form-group">
+                        <br>
+                        <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
+                            Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector)
+                            that is responsive to community-identified initiatives or needs:</strong></label>
+                        <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" required>{{ summer_experience.roleDescription }}</textarea><br>
+                    </div>
+        
+                    <div class="form-group">
+                        <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
+                        <input type="radio" id="internship" name="experienceType" value="Internship" {% if summer_experience.experienceType == 'Internship' %}checked{% endif %} required>
+                        <label for="internship">Internship</label><br>
+                        <input type="radio" id="cbr" name="experienceType" value="Community-based research" {% if summer_experience.experienceType == 'Community-based research' %}checked{% endif %}>
+                        <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
+                        <input type="radio" id="communityLabor" name="experienceType" value="Community-Based Labor Position" {% if summer_experience.experienceType == 'Community-Based Labor Position' %}checked{% endif %}>
+                        <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
+                        <input type="radio" id="epgInternship" name="experienceType" value="EPG Summer Internship" {% if summer_experience.experienceType == 'EPG Summer Internship' %}checked{% endif %}>
+                        <label for="epgInternship">EPG Summer Internship</label><br>
+                        <input type="radio" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service" {% if summer_experience.experienceType == 'Bonner Scholar Summer of Service' %}checked{% endif %}>
+                        <label for="bonnerService">Bonner Scholar Summer of Service</label>
+                        <br>
+                        <input type="radio" id="otherExperience" name="experienceType" value="Other" {% if summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}checked{% endif %} required>
+                        <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
+                        <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" {% if summer_experience.experienceType in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}style="display:none;"{% endif %}>{{ summer_experience.experienceType if summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] else '' }}</textarea><br>
+                    </div>
+        
+                    <div class="form-group">
+                        <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please select all that apply.</strong></label><br>
+                        <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality" {% if 'Power and inequality' in summer_experience.CceMinorContentArea %}checked{% endif %}>
+                        <label for="powerInequality">Power and inequality</label><br>
+                        <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity" {% if 'Community and identity' in summer_experience.CceMinorContentArea %}checked{% endif %}>
+                        <label for="communityIdentity">Community and identity</label><br>
+                        <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy" {% if 'Civic literacy' in summer_experience.CceMinorContentArea %}checked{% endif %}>
+                        <label for="civicLiteracy">Civic literacy</label><br>
+                        <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills" {% if 'Civic skills' in summer_experience.CceMinorContentArea %}checked{% endif %}>
+                        <label for="civicSkills">Civic skills</label><br><br>
+                    </div>
+        
+                    <div class="form-group">
+                        <label for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
+                        <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" {% if summer_experience.experienceHoursOver300 %}checked{% endif %} onclick="toggleTextarea()">
+                        <label for="yes300hours">Yes</label><br>
+                        <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" {% if not summer_experience.experienceHoursOver300 %}checked{% endif %} onclick="toggleTextarea()">
+                        <label for="no300hours">No</label>
+                        <div id="hoursBelow300Container" {% if summer_experience.experienceHoursOver300 %}style="display:none;"{% endif %}>
+                            <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks.">{{ summer_experience.experienceHoursBelow300 }}</textarea>
+                        </div>
+                    </div>
+        
+                    <br><br>
+        
+                    <div class="text-center mt-3" id="edit-buttons" style="display: none;">
+                      <input class="btn btn-primary" type="submit" value="Update Proposal"/> 
+                      <button type="button" class="btn btn-secondary" id="cancel-edit-button">Cancel</button>
+                    </div>
+                    <div class="text-center mt-3" id="view-buttons">
+                      <button type="button" class="btn btn-info text-white" id="edit-proposal-button">Edit Proposal</button>
+                      <input type="hidden" id="experience-id" value="{{ summer_experience.id }}">
+                      <button type="button" class="btn btn-danger" id="withdraw-button">Withdraw Proposal</button>
                   </div>
+                  
+
                 </div>
-          
-                <div class="row">
-                  <div class="form-group col-md-6">
-                    <label class="form-label me-2" for="dateCreated"><strong>Today's Date</strong></label>
+            </div>
+        </form>
+        
+        
+          {% else %}
+          <!-- Display summer experience form -->
+          <form id='summer-experience-form' enctype="multipart/form-data" role='form' action="{{ url_for('minor.addASummerExperience', username=user.username) }}" method="POST">
+            <div class='row'>
+                <div class="container">
+                    <div class='form-group mb-4 text-center'>
+                        <h4>Proposal for Community-Engaged Summer Experience</h4>
+                        <p>
+                            The minor requires an Intensive Community-Engaged Summer Experience that is focused on work that more deeply explores at least one of the four following key content areas: power and inequality, community and identity, civic literacy, or civic skills.
+                        </p>
+                    </div>
+        
+                    <div class="form-group">
+                        <br>
+                        <h4> Student Information </h4>
+                        <hr>
+                    </div>
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label"><strong>Student Name</strong></label>
+                            <div class="input-group">
+                                <input type="text" id="studentName" name="studentName" value="{{user.fullName}}" class="form-control" placeholder="Student's Name" autocomplete="off" readonly />
+                            </div>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label"><strong>Email</strong></label>
+                            <input class="form-control" id="studentEmail" placeholder="Student's email" name="studentEmail" value="{{user.email}}" readonly />
+                            <br>
+                        </div>
+                    </div>
+        
+                    <div class="row">
+                        <div class="form-group col-md-6">
+                            <label class="form-label me-2" for="summerYear"><strong>Summer Year</strong></label>
+                            <select class="form-select" id="summerYear" name="summerYear" required>
+                                <option value="" disabled selected>Select Year</option>
+                            </select>
+                        </div>
+                        <div class="form-group col-md-6">
+                            <label class="form-label me-2" for="dateCreated"><strong>Submission Date</strong></label>
+                            <br>
+                            <input class="form-control" type="date" id="date" name="date" required>
+                        </div>
+                    </div>
+        
+                    <div class="form-group">
+                        <br>
+                        <h4>Company/Organization Information</h4>
+                        <hr>
+                    </div>
+        
+                    <div class="form-group">
+                        <label class="form-label" for="company"><strong>Name</strong></label>
+                        <input class="form-control" id="company" name="company" placeholder="Company or organization's name" required/>
+                    </div>
+        
                     <br>
-                    <input type="date" id="date" name="date" required>
-                  </div>
+        
+                    <div class="form-group">
+                        <label class="form-label" for="companyAddress"><strong>Address</strong></label>
+                        <input class="form-control" id="companyAddress" name="companyAddress" placeholder="Company or organization's physical address" required/>
+                    </div>
+        
+                    <br>
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label" for="companyPhone"><strong>Phone Number</strong></label>
+                            <input class="form-control phone-input" id="companyPhone" name="companyPhone" placeholder="Company or organization's phone number" required/>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label" for="companyWebsite"><strong>Website</strong></label>
+                            <input class="form-control" id="companyWebsite" name="companyWebsite" placeholder="Company or organization's website" required/>
+                        </div>
+                    </div>
+        
+                    <br> 
+        
+                    <div class="form-group">
+                        <br>
+                        <h4> Supervisor Information </h4>
+                        <hr>
+                    </div>
+                    <div class="row">
+                        <div class="form-group col-12">
+                            <label class="form-label" for="directSupervisor"> <strong>Direct Supervisor Name (or "Yet to be determined")</strong> </label>
+                            <input class="form-control" id="directSupervisor" placeholder="Name of Direct Supervisor" name="directSupervisor" required>
+                        </div>
+                    </div>
+
+                    <br>
+        
+                    <div class="row">
+                        <div class="form-group col-6">
+                            <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
+                            <input class="form-control phone-input" id="supervisorPhone" name="supervisorPhone" placeholder="Supervisor's phone number" required/>
+                        </div>
+                        <div class="form-group col-6">
+                            <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
+                            <input class="form-control email-input" id="supervisorEmail" name="supervisorEmail" placeholder="Supervisor's email" required/>
+                            <br>
+                        </div>
+                    </div>
+        
+                    <div class="form-group">
+                        <br>
+                        <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
+                            Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector)
+                            that is responsive to community-identified initiatives or needs:</strong></label>
+                        <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Enter your role description" required></textarea><br>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
+                        <input type="radio" id="internship" name="experienceType" value="Internship" required>
+                        <label for="internship">Internship</label><br>
+                        <input type="radio" id="cbr" name="experienceType" value="Community-based research">
+                        <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
+                        <input type="radio" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
+                        <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
+                        <input type="radio" id="epgInternship" name="experienceType" value="EPG Summer Internship">
+                        <label for="epgInternship">EPG Summer Internship</label><br>
+                        <input type="radio" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
+                        <label for="bonnerService">Bonner Scholar Summer of Service</label>
+                        <br>
+                        <input type="radio" id="otherExperience" name="experienceType" value="Other" required>
+                        <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
+                        <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" placeholder="Enter your summer experience" style="display:none;"></textarea><br>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please select all that apply.</strong></label><br>
+                        <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
+                        <label for="powerInequality">Power and inequality</label><br>
+                        <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
+                        <label for="communityIdentity">Community and identity</label><br>
+                        <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
+                        <label for="civicLiteracy">Civic literacy</label><br>
+                        <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
+                        <label for="civicSkills">Civic skills</label><br><br>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
+                        <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" onclick="toggleTextarea()">
+                        <label for="yes300hours">Yes</label><br>
+                        <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" onclick="toggleTextarea()">
+                        <label for="no300hours">No</label>
+                        <div id="hoursBelow300Container" style="display:none;">
+                            <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks."></textarea>
+                        </div>
+                    </div>
+                    
+                    <br><br>
+              
+                    <div class="text-center">
+                        <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+                    </div>
                 </div>
-          
-                <div class="form-group">
+            </div>
+          </form>
+          {% endif %}
+        </div>
+      </div>
+      <div class="tab-pane fade show{{ 'active' if activeTab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
+        <!-- <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{% if other_experience %}{{ url_for('minor.edit_other_engagement', username=user.username) }}{% else %}{{ url_for('minor.addOtherEngagement', username=user.username) }}{% endif %}" method="post" data-term-id="{{ other_experience.term.id if other_experience else '' }}"> -->
+        <form id='requestOtherCommEng' enctype="multipart/form-data" role='form' action="{% if other_experience %}{{ url_for('minor.edit_other_engagement', username=user.username) }}?tab=otherEngagement{% else %}{{ url_for('minor.addOtherEngagement', username=user.username) }}?tab=otherEngagement{% endif %}" method="post" data-term-id="{{ other_experience.term.id if other_experience else '' }}">
+
+          <div class='row'>
+              <div class="container text-center">
+                  <div class='form-group mb-4'>
+                      <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
+                      <input type="hidden" value="{{ user }}" name="user"/>
+                      <input type="hidden" id="other-experience-id" name="experience-id" value="{{ other_experience.id if other_experience else '' }}">
+                  </div>
+              </div>
+      
+              <div class="form-group">
+                  <label class="form-label" for="inputTerm"><strong>Term</strong></label>
+                  <select class="form-select" name="term" id="inputTerm" required {% if other_experience %}disabled{% endif %}>
+                      <!-- Options will be dynamically generated by JavaScript -->
+                  </select>
+              </div>
+      
+              <div class="form-group">
+                  <label class="form-label" for="experienceName"><strong>Experience Title</strong></label>
+                  <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" value="{{ other_experience.activity if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
+              </div>
+      
+              <div class="form-group">
                   <br>
-                  <h4> Company/Organization Information </h4>
+                  <h4>Company/Organization Information</h4>
                   <hr>
-                </div>
-          
-                <div class="form-group">
-                  <label class="form-label" for="company"><strong>Name</strong></label>
-                  <input class="form-control" id="company" placeholder="Company or organization's name" name="company" required/>
-                </div>
-          
-                <br>
-          
-                <div class="form-group">
-                  <label class="form-label" for="companyAddress"><strong>Address</strong></label>
-                  <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress" required/>
-                </div>
-          
-                <br>
-          
-                <div class="row">
+              </div>
+      
+              <div class="form-group">
+                  <label class="form-label" for="companyOrOrg"><strong>Name</strong></label>
+                  <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="companyOrOrg" value="{{ other_experience.company if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
+              </div>
+      
+              <div class="form-group">
+                  <label class="form-label" for="otherCompanyAddress"><strong>Address</strong></label>
+                  <input class="form-control" id="otherCompanyAddress" placeholder="Company or organization's physical address" name="otherCompanyAddress" value="{{ other_experience.company_address if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
+              </div>
+      
+              <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="companyPhone"><strong>Phone Number</strong></label>
-                    <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone" required/>
+                      <label class="form-label" for="otherCompanyPhone"><strong>Phone Number</strong></label>
+                      <input class="form-control phone-input" id="otherCompanyPhone" placeholder="Company or organization's phone number" name="otherCompanyPhone" value="{{ other_experience.company_phone if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
                   </div>
                   <div class="form-group col-6">
-                    <label class="form-label" for="companyWebsite"><strong>Website</strong></label>
-                    <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite" required/>
+                      <label class="form-label" for="otherCompanyWebsite"><strong>Website</strong></label>
+                      <input class="form-control" id="otherCompanyWebsite" placeholder="Company or organization's website" name="otherCompanyWebsite" value="{{ other_experience.company_website if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
                   </div>
-                </div>
-          
-                <br> 
-          
-                <div class="form-group">
+              </div>
+      
+              <div class="form-group">
                   <br>
-                  <h4> Supervisor Information </h4>
+                  <h4>Supervisor Information</h4>
                   <hr>
-                </div>
-          
-                <div class="row">
-                  <div class="form-group col-6">
-                    <label class="form-label" for="supervisorPhone"><strong>Phone Number</strong></label>
-                    <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone" required/>
+              </div>
+      
+              <div class="row">
+                  <div class="form-group col-12">
+                      <label class="form-label" for="otherDirectSupervisor"><strong>Direct Supervisor Name (or "Yet to be determined")</strong></label>
+                      <input class="form-control" id="otherDirectSupervisor" placeholder="Name of Direct Supervisor" name="otherDirectSupervisor" value="{{ other_experience.supervisor_name if other_experience else '' }}" {% if other_experience %}disabled{% endif %}>
                   </div>
+              </div>
+      
+              <div class="row">
                   <div class="form-group col-6">
-                    <label class="form-label" for="supervisorEmail"><strong>Email</strong></label>
-                    <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail" required/>
-                    <br>
+                      <label class="form-label" for="otherSupervisorPhone"><strong>Phone Number</strong></label>
+                      <input class="form-control phone-input" id="otherSupervisorPhone" placeholder="Supervisor's phone number" name="otherSupervisorPhone" value="{{ other_experience.supervisor_phone if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
                   </div>
-                </div>
-          
-                <div class="form-group">
-                  <br>
-                  <label for="roleDescription"><strong>Briefly describe your role and scope of work with this organization during your community-engaged experience. 
-                    Your experience should focus on applied work with a public-facing institution (non-profit, community-based, governmental, or private sector)
-                    that is responsive to community-identified initiatives or needs:</strong></label>
-                  <textarea class="form-control" rows="4" cols="72" id="roleDescription" name="roleDescription" placeholder="Enter your role description" required></textarea><br>
-                </div>
-                
-                <div class="form-group">
-                  <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please check one.</strong></label><br>
-                  <input type="radio" id="internship" name="experienceType" value="Internship" required>
-                  <label for="internship">Internship</label><br>
-                  <input type="radio" id="cbr" name="experienceType" value="Community-based research">
-                  <label for="cbr">Community-based research (CBR) within URCPP or other research that meets established criteria</label><br>
-                  <input type="radio" id="communityLabor" name="experienceType" value="Community-Based Labor Position">
-                  <label for="communityLabor">Community-Based Labor Position, either in Berea or through the Off-Campus Summer Labor Experience</label><br>
-                  <input type="radio" id="epgInternship" name="experienceType" value="EPG Summer Internship">
-                  <label for="epgInternship">EPG Summer Internship</label><br>
-                  <input type="radio" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service">
-                  <label for="bonnerService">Bonner Scholar Summer of Service</label>
-                  <br>
-                  <input type="radio" id="otherExperience" name="experienceType" value="Other" required>
-                  <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
-                  <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" placeholder="Enter your summer experience" style="display:none;"></textarea><br>
-                </div>
-                
-                <div class="form-group">
-                  <label><strong>Which of the four key content areas of the Community and Civic Engagement Minor will your Community-Engaged Summer Experience address? Please check all that apply.</strong></label><br>
-                  <input type="checkbox" id="powerInequality" name="contentArea" value="Power and inequality">
-                  <label for="powerInequality">Power and inequality</label><br>
-                  <input type="checkbox" id="communityIdentity" name="contentArea" value="Community and identity">
-                  <label for="communityIdentity">Community and identity</label><br>
-                  <input type="checkbox" id="civicLiteracy" name="contentArea" value="Civic literacy">
-                  <label for="civicLiteracy">Civic literacy</label><br>
-                  <input type="checkbox" id="civicSkills" name="contentArea" value="Civic skills">
-                  <label for="civicSkills">Civic skills</label><br><br>
-                </div>
-                
-                <div class="form-group">
-                  <label for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
-                  <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" onclick="toggleTextarea()">
-                  <label for="yes300hours">Yes</label><br>
-                  <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" onclick="toggleTextarea()">
-                  <label for="no300hours">No</label>
-                  <div id="hoursBelow300Container" style="display:none;">
-                    <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks if less than 300" required></textarea>
+                  <div class="form-group col-6">
+                      <label class="form-label" for="otherSupervisorEmail"><strong>Email</strong></label>
+                      <input class="form-control email-input" id="otherSupervisorEmail" placeholder="Supervisor's email" name="otherSupervisorEmail" value="{{ other_experience.supervisor_email if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
                   </div>
-                </div>
-                
-                
-                <br><br>
-                
-                {% if filepaths %}
-                <div class="form-group col-md-4 mb-4">
-                  {% from 'displayFilesMacro.html' import displayFiles %}
-                  {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
-                </div>
-                {% endif %}
-          
-                <div class="text-center">
-                  <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
-                </div>
               </div>
-            </div>
-          </form>
-           
-        </div>
-      </div>
-      <div class="tab-pane fade {{ 'active' if activeTab == 'bonnerscholarsevents' else '' }}" id="pills-bonner-scholars" role="tabpanel" aria-labelledby="bonnerscholarsevents">
-        <form id='requestothercommeng' enctype="multipart/form-data" role='form' action="{{ request.path }}" method="post">
-          <div class='row'>
-            <div class="container text-center">
-              <div class='form-group mb-4'>
-                <h2 class='form-label' for='studentUser'> {{ user.firstName }} {{ user.lastName }}: Other Community Engaged Experience </h2>
-                <input type="hidden" value="{{ user }}" name="user"/>
+      
+              <div class="form-group">
+                  <label class="mb-2" for="supervisorAttachment"><strong>Upload Confirmation of Participation</strong> (From Supervisor)</label>
+                  <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx" {% if other_experience %}disabled{% endif %}/>
               </div>
-            </div>
-
-            <div class="form-group">
-              <label class="form-label" for="inputTerm"> <strong>Term</strong> </label>
-              <select class="form-select" name="term" id="inputTerm" required>
-                {% for term in terms %}   
-                <option value="{{ term }}">{{ term.description }}</option>
-                {% endfor %}
-              </select>
-            </div>
-
-            <br><br><br><br>
-
-            <div class="form-group">
-              <label class="form-label" for="experienceName"> <strong>Experience Title</strong> </label>
-              <input class="form-control" id="experienceName" placeholder="Enter a name for your experience" name="experienceName" required/>
-            </div>
-
-            <br><br><br><br>
-
-            <div class="form-group">
-              <br>
-              <h4> Company/Organization Information </h4>
-              <hr>
-            </div>
-
-            <div class="form-group">
-              <label class="form-label" for="companyOrOrg"> <strong>Name</strong> </label>
-              <input class="form-control" id="companyOrOrg" placeholder="Company or organization's name" name="company"/>
-            </div>
-
-            <br>
-
-            <div class="form-group">
-              <label class="form-label" for="companyAddress"> <strong>Address</strong> </label>
-              <input class="form-control" id="companyAddress" placeholder="Company or organization's physical address" name="companyAddress"/>
-            </div>
-
-            <br>
-
-            <div class="row">
-              <div class="form-group col-6">
-                <label class="form-label" for="companyPhone"> <strong>Phone Number</strong> </label>
-                <input class="form-control phone-input" id="companyPhone" placeholder="Company or organization's phone number" name="companyPhone"/>
+      
+              <div class="form-group">
+                  <br>
+                  <h4>Experience Information</h4>
+                  <hr>
               </div>
-              <div class="form-group col-6">
-                <label class="form-label" for="companyWebsite"> <strong>Website</strong> </label>
-                <input class="form-control" id="companyWebsite" placeholder="Company or organization's website" name="companyWebsite"/>
+      
+              <div class="form-group">
+                  <label class="form-label" for="totalHours"><strong>Total Hours</strong></label>
+                  <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours" value="{{ other_experience.hours if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
               </div>
-            </div>
-
-            <br> 
-
-            <div class="form-group">
-              <br>
-              <h4> Supervisor Information </h4>
-              <hr>
-            </div>
-
-            <div class="row">
-              <div class="form-group col-6">
-                <label class="form-label" for="supervisorPhone"> <strong>Phone Number</strong> </label>
-                <input class="form-control phone-input" id="supervisorPhone" placeholder="Supervisor's phone number" name="supervisorPhone"/>
+      
+              <div class="form-group">
+                  <label class="form-label" for="totalWeeks"><strong>Weeks Worked</strong></label>
+                  <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks" value="{{ other_experience.weeks if other_experience else '' }}" {% if other_experience %}disabled{% endif %}/>
               </div>
-              <div class="form-group col-6">
-                <label class="form-label" for="supervisorEmail"> <strong>Email</strong> </label>
-                <input class="form-control email-input" id="supervisorEmail" placeholder="Supervisor's email" name="supervisorEmail"/>
+      
+              <div class="form-group">
+                  <label class="form-label" for="experienceDescription"><strong>Experience Description</strong></label>
+                  <textarea class="form-control" rows="5" cols="72" id="experienceDescription" placeholder="Please describe your experience" name="description" {% if other_experience %}disabled{% endif %}>{{ other_experience.service if other_experience else '' }}</textarea>
               </div>
-            </div>
+              
+              <br><br>
 
-            <br>
-
-            <div class="form-group">
-              <label class="mb-2" for="supervisorAttachment"> <strong>Upload Confirmation of Participation</strong> (From Supervisor) </label>
-              <input class="form-control" id="supervisorAttachment" name="attachmentObject" type="file" multiple accept=".png, .jpg, .pdf, .jpeg, .docx, .xlsx"/>
-            </div>
-
-            <br>
-
-            <div class="form-group">
-              <br>
-              <h4> Experience Information </h4>
-              <hr>
-            </div>
-
-            <div class="form-group">
-              <label class="form-label" for="totalHours"><strong> Total Hours </strong></label>
-              <input class="form-control" id="totalHours" placeholder="Enter the total hours worked" type="number" name="totalHours"/>
-            </div>
-
-            <br>
-
-            <div class="form-group">
-              <label class="form-label" for="totalWeeks"><strong> Weeks Worked </strong></label>
-              <input class="form-control" id="totalWeeks" placeholder="Enter total number of weeks worked" type="number" name="weeks"/>
-            </div>
-
-            <br>
-
-            <div class="form-group">
-              <label class="form-label" for="experienceDescription"><strong> Experience Description </strong></label>
-              <textarea class="form-control" rows="5" cols="72" id="experienceDescription" type="text" placeholder="Please describe your experience" name="description" required></textarea>
-              <br>
+              <div class="text-center">
+                <input class="btn btn-primary" type="submit" value="Send Request for Approval" {% if other_experience %}style="display: none;"{% endif %}/> 
+              </div>
+            
+            <div class="text-center mt-3" id="edit-other-buttons" style="display: none;">
+                <input class="btn btn-primary" type="submit" value="Update Proposal"/> 
+                <button type="button" class="btn btn-secondary" id="cancel-other-edit-button">Cancel</button>
             </div>
-
-            {% if filepaths %}
-            <div class="form-group col-md-4 mb-4">
-              {% from 'displayFilesMacro.html' import displayFiles %}
-              {{ displayFiles(filepaths,'RequestOtherEngagement', '/deleteRequestFile', term.id) }}
+            
+            <div class="text-center mt-3" id="view-other-buttons" {% if not other_experience %}style="display: none;"{% endif %}>
+                <button type="button" class="btn btn-info text-white" id="edit-other-proposal-button">Edit Proposal</button>
+                <button type="button" class="btn btn-danger" id="withdraw-other-button">Withdraw Proposal</button>
             </div>
-            {% endif %}
-
-            <input class="btn btn-primary" type="submit" value="Send Request for Approval"/> 
+            
           </div>
-        </form>
+      </form>
+     
       </div>
     </div>
   </div>
diff --git a/database/migrate_db.sh b/database/migrate_db.sh
index fe5e8e636..9022656d4 100755
--- a/database/migrate_db.sh
+++ b/database/migrate_db.sh
@@ -71,6 +71,7 @@ pem add app.models.celtsLabor.CeltsLabor
 pem add app.models.communityEngagementRequest.CommunityEngagementRequest
 pem add app.models.individualRequirement.IndividualRequirement
 pem add app.models.summerExperience.SummerExperience
+pem add app.models.otherExperience.OtherExperience
 
 
 pem watch

From 87323caeecdc7525eba1fa2ef733f1723a3582f8 Mon Sep 17 00:00:00 2001
From: mbeweg <mbeweg@berea.edu>
Date: Fri, 8 Nov 2024 16:18:08 -0500
Subject: [PATCH 11/16] Fixing comments

---
 app/__init__.py                               |  4 --
 app/controllers/minor/routes.py               | 61 ++++++-------------
 .../js/{profile.js => minorProfilePage.js}    |  0
 3 files changed, 20 insertions(+), 45 deletions(-)
 rename app/static/js/{profile.js => minorProfilePage.js} (100%)

diff --git a/app/__init__.py b/app/__init__.py
index 8d59c6c3b..5e0f35c8c 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -112,7 +112,3 @@ def handle_bad_request(e):
 def handle_bad_request(e):
     return render_template("/errors/500error.html",
                             supportEmail = supportContactEmail)
-
-
-if __name__ == '__main__':
-    app.run()
\ No newline at end of file
diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index 7689096f2..2c4e66f73 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -13,7 +13,27 @@
 from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, saveSummerExperience, getSummerTerms, getSummerExperience, getEngagementTotal, createSummerExperience, createOtherEngagement
 import logging
 
+@minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
+def viewCceMinor(username):
+    """
+        Load minor management page with community engagements and summer experience
+    """
+    if not (g.current_user.isAdmin):
+        return abort(403)
+
+    sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
+    selectedSummerTerm, summerExperience = getSummerExperience(username)
 
+    return render_template("minor/profile.html",
+                            user = User.get_by_id(username),
+                            sustainedEngagementByTerm = sustainedEngagementByTerm,
+                            summerExperience = summerExperience if summerExperience else "",
+                            selectedSummerTerm = selectedSummerTerm,
+                            totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
+                            summerTerms = getSummerTerms(),
+                            allTerms = getSummerExperience(username))
+
+    
 # ################################################## SUMMER EXPERIENCE START ###########################################################
 
 @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
@@ -29,27 +49,6 @@ def addASummerExperience(username):
 
 
 
-@minor_bp.route('/cceMinor/<username>/viewProposal', methods=['GET'])
-def viewProposal(username):
-    try:
-        user = User.get(User.username == username)
-        try:
-            summer_experience = (SummerExperience
-                                 .select()
-                                 .where(SummerExperience.user == user)
-                                 .order_by(SummerExperience.id.desc())
-                                 .get())
-        except SummerExperience.DoesNotExist:
-            summer_experience = None  # No summer experience found
-
-        return render_template('minor/profile.html', user=user, summer_experience=summer_experience, activeTab='trainingEvents')
-   
-    except Exception as e:
-        flash(f"Error retrieving proposal: {e}", 'danger')
-        return redirect(url_for('minor.viewCceMinor', username=username))
-
-
-
 
 @minor_bp.route('/profile/<username>/withdrawSummerExperience', methods=['POST'])
 def withdrawSummerExperience(username):
@@ -184,27 +183,7 @@ def edit_other_engagement(username):
 
 # ###############################################################################
 
-@minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
-def viewCceMinor(username):
-    """
-        Load minor management page with community engagements and summer experience
-    """
-    if not (g.current_user.isAdmin):
-        return abort(403)
 
-    sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
-    selectedSummerTerm, summerExperience = getSummerExperience(username)
-
-    return render_template("minor/profile.html",
-                            user = User.get_by_id(username),
-                            sustainedEngagementByTerm = sustainedEngagementByTerm,
-                            summerExperience = summerExperience if summerExperience else "",
-                            selectedSummerTerm = selectedSummerTerm,
-                            totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
-                            summerTerms = getSummerTerms(),
-                            allTerms = getSummerExperience(username))
-
-    
 
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
diff --git a/app/static/js/profile.js b/app/static/js/minorProfilePage.js
similarity index 100%
rename from app/static/js/profile.js
rename to app/static/js/minorProfilePage.js

From 3e84f2460bb9eae6c3a3bcaa2b0fc0e62b205949 Mon Sep 17 00:00:00 2001
From: mbeweg <mbeweg@berea.edu>
Date: Tue, 19 Nov 2024 13:53:49 -0500
Subject: [PATCH 12/16] Fixed the issues.

---
 app/models/summerExperience.py   | 6 ++----
 app/templates/base.html          | 6 ------
 app/templates/minor/profile.html | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/models/summerExperience.py b/app/models/summerExperience.py
index 38e7d5426..3426f81ff 100644
--- a/app/models/summerExperience.py
+++ b/app/models/summerExperience.py
@@ -8,7 +8,7 @@ class SummerExperience(baseModel):
     summerYear = CharField()
     roleDescription = TextField()
     experienceType = CharField()
-    CceMinorContentArea = TextField()  # Store as comma-separated values or use a related table if needed
+    contentAreas = TextField()  # Store as comma-separated values or use a related table if needed
     experienceHoursOver300 = BooleanField()
     experienceHoursBelow300 = CharField(null=True)  # Optional for hours if less than 300
     status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")], default='Pending')
@@ -19,7 +19,5 @@ class SummerExperience(baseModel):
     supervisorName = CharField()
     supervisorPhone = CharField()
     supervisorEmail = CharField()
-    created_at = DateTimeField(default=datetime.datetime.now)
+    createdOn = DateTimeField(default=datetime.datetime.now)
 
-    class Meta:
-        db_table = 'summerExperience'
diff --git a/app/templates/base.html b/app/templates/base.html
index 9f1b27954..348fd7cf4 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -97,12 +97,6 @@
   <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
   <script src="{{url_for('static', filename='js/bootstrap.bundle.min.js') }}?u={{lastStaticUpdate}}" type="text/javascript"></script>
   <script src="{{url_for('static', filename='js/base.js') }}?u={{lastStaticUpdate}}" type="text/javascript"></script>
-  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 
 
 {% endblock %}
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 9be4b1e41..cb5efb398 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -6,7 +6,6 @@
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
   <script type="text/javascript" src="{{ url_for('static', filename='js/cceMinorProfilePage.js') }}?u={{ lastStaticUpdate }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/profile.js') }}"></script>
-  <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
 {% endblock %}
 

From 652e25833178cc50c7c02a377c85ee6f2abf4364 Mon Sep 17 00:00:00 2001
From: mbeweg <mbeweg@berea.edu>
Date: Wed, 20 Nov 2024 12:53:47 -0500
Subject: [PATCH 13/16] Fixed the issue.

---
 app/logic/minor.py               | 13 +++++--------
 app/templates/minor/profile.html |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/logic/minor.py b/app/logic/minor.py
index eeb7e05de..7b1bb90cd 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -28,14 +28,11 @@ def createSummerExperience(username, form_data):
         user = User.get(User.username == username)
         content_area = ', '.join(form_data.getlist('contentArea'))  # Combine multiple content areas
 
-        # Determine the experience type
-        experience_type = form_data['experienceType']
-        if experience_type == 'Other':
-            other_experience_description = form_data.get('otherExperienceDescription', '')
-            if not other_experience_description:
-                raise ValueError("Other experience description is required.")
-            experience_type = other_experience_description
-
+        # Directly assign the experience type
+        experience_type = form_data['experienceType'] if form_data['experienceType'] != 'Other' else form_data.get('otherExperienceDescription', '')
+        if experience_type == '':  # Check if the otherExperienceDescription is empty when required
+            raise ValueError("Other experience description is required.")
+        
         SummerExperience.create(
             user=user,
             studentName=form_data['studentName'],
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index cb5efb398..168b60ca5 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -241,9 +241,9 @@ <h4> Supervisor Information </h4>
         
                     <div class="form-group">
                         <label for="experienceHoursOver300"><strong>Will your experience include at least 300 hours of work over the span of at least 8 weeks?</strong></label><br>
-                        <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" {% if summer_experience.experienceHoursOver300 %}checked{% endif %} onclick="toggleTextarea()">
+                        <input type="radio" id="yes300hours" name="experienceHoursOver300" value="Yes" {% if summer_experience.experienceHoursOver300 %}checked{% endif %}>
                         <label for="yes300hours">Yes</label><br>
-                        <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" {% if not summer_experience.experienceHoursOver300 %}checked{% endif %} onclick="toggleTextarea()">
+                        <input type="radio" id="no300hours" name="experienceHoursOver300" value="No" {% if not summer_experience.experienceHoursOver300 %}checked{% endif %}>
                         <label for="no300hours">No</label>
                         <div id="hoursBelow300Container" {% if summer_experience.experienceHoursOver300 %}style="display:none;"{% endif %}>
                             <textarea class="form-control" rows="1" cols="72" id="experienceHoursBelow300" name="experienceHoursBelow300" placeholder="Enter the hours and number of weeks.">{{ summer_experience.experienceHoursBelow300 }}</textarea>

From 2106b77334b550d9f29c46af4bcae8853f2e10a9 Mon Sep 17 00:00:00 2001
From: glek <156453486+Kafui123@users.noreply.github.com>
Date: Wed, 15 Jan 2025 22:32:40 +0000
Subject: [PATCH 14/16] Resolved PR Comments on January 15

---
 app/templates/minor/profile.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 168b60ca5..164a7ac0a 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -222,9 +222,11 @@ <h4> Supervisor Information </h4>
                         <input type="radio" id="bonnerService" name="experienceType" value="Bonner Scholar Summer of Service" {% if summer_experience.experienceType == 'Bonner Scholar Summer of Service' %}checked{% endif %}>
                         <label for="bonnerService">Bonner Scholar Summer of Service</label>
                         <br>
-                        <input type="radio" id="otherExperience" name="experienceType" value="Other" {% if summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}checked{% endif %} required>
+
+                        {% set isValidExperience = summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}
+                        <input type="radio" id="otherExperience" name="experienceType" value="Other" {% if isValidExperience %}checked{% endif %} required>
                         <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
-                        <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" {% if summer_experience.experienceType in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}style="display:none;"{% endif %}>{{ summer_experience.experienceType if summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] else '' }}</textarea><br>
+                        <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" {% if isValidExperience %}style="display:none;"{% endif %}>{{ summer_experience.experienceType if isValidExperience else '' }}</textarea><br>
                     </div>
         
                     <div class="form-group">

From e5183671c578cc2ad45afe246da1adf9bc5f4562 Mon Sep 17 00:00:00 2001
From: glek <156453486+Kafui123@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:54:30 +0000
Subject: [PATCH 15/16] Modifying the code based on comments

---
 app/static/js/minorProfilePage.js | 1 -
 app/templates/minor/profile.html  | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/static/js/minorProfilePage.js b/app/static/js/minorProfilePage.js
index 38cf2b0de..fded52334 100644
--- a/app/static/js/minorProfilePage.js
+++ b/app/static/js/minorProfilePage.js
@@ -1,7 +1,6 @@
 import searchUser from './searchUser.js';
 
 function callback(selected) {
-  console.log('Selected student:', selected);
   $("#searchStudentsInput").val(`${selected.firstName} ${selected.lastName}`);
   $("#studentEmail").val(selected.email);
 }
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 164a7ac0a..38ac79e63 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -210,7 +210,7 @@ <h4> Supervisor Information </h4>
                     </div>
         
                     <div class="form-group">
-                        <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
+                        <label><strong>Whhhhhh of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
                         <input type="radio" id="internship" name="experienceType" value="Internship" {% if summer_experience.experienceType == 'Internship' %}checked{% endif %} required>
                         <label for="internship">Internship</label><br>
                         <input type="radio" id="cbr" name="experienceType" value="Community-based research" {% if summer_experience.experienceType == 'Community-based research' %}checked{% endif %}>
@@ -224,6 +224,8 @@ <h4> Supervisor Information </h4>
                         <br>
 
                         {% set isValidExperience = summer_experience.experienceType not in ['Internship', 'Community-based research', 'Community-Based Labor Position', 'EPG Summer Internship', 'Bonner Scholar Summer of Service'] %}
+                        <div>{{summer_experience.experienceType}}</div>
+                        <div>Hello</div>
                         <input type="radio" id="otherExperience" name="experienceType" value="Other" {% if isValidExperience %}checked{% endif %} required>
                         <label for="otherExperience">Other. Briefly describe your summer experience below if it will not be one of the other experiences listed.</label><br>
                         <textarea class="form-control" rows="2" cols="72" id="otherExperienceDescription" name="otherExperienceDescription" {% if isValidExperience %}style="display:none;"{% endif %}>{{ summer_experience.experienceType if isValidExperience else '' }}</textarea><br>

From 15e975b8b4f74cb071558e6df8e73bacc64e805c Mon Sep 17 00:00:00 2001
From: glek <156453486+Kafui123@users.noreply.github.com>
Date: Fri, 17 Jan 2025 17:23:03 +0000
Subject: [PATCH 16/16] Resolved changes to comments on Jan 17

---
 app/controllers/minor/routes.py     |  5 +----
 app/logic/minor.py                  | 18 ++----------------
 app/models/individualRequirement.py |  1 -
 app/static/js/minorProfilePage.js   |  7 +++----
 app/templates/minor/profile.html    |  4 ++--
 5 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/app/controllers/minor/routes.py b/app/controllers/minor/routes.py
index 2c4e66f73..d2e9e5c59 100644
--- a/app/controllers/minor/routes.py
+++ b/app/controllers/minor/routes.py
@@ -37,7 +37,7 @@ def viewCceMinor(username):
 # ################################################## SUMMER EXPERIENCE START ###########################################################
 
 @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
-def addASummerExperience(username):
+def addSummerExperience(username):
     try:
         createSummerExperience(username, request.form)
         flash(f'Summer Experience added successfully by {username}', 'success')
@@ -143,7 +143,6 @@ def view_other_engagement(username):
 
 
 
-@minor_bp.route('/api/terms', methods=['GET'])
 def get_terms():
     terms = Term.select()
     term_list = [{'id': term.id, 'name': term.description} for term in terms]
@@ -239,8 +238,6 @@ def requestOtherEngagement(username):
     return render_template("/minor/requestOtherEngagement.html",
                             user=user,
                             terms=terms)
-
-# @minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
 def addSummerExperience(username):
     saveSummerExperience(username, request.form, g.current_user)
 
diff --git a/app/logic/minor.py b/app/logic/minor.py
index f5307fcdf..2541fe976 100644
--- a/app/logic/minor.py
+++ b/app/logic/minor.py
@@ -35,22 +35,8 @@ def createSummerExperience(username, form_data):
         
         SummerExperience.create(
             user=user,
-            studentName=form_data['studentName'],
-            summerYear=form_data['summerYear'],
-            roleDescription=form_data['roleDescription'],
-            experienceType=experience_type,
-            CceMinorContentArea=content_area,
-            experienceHoursOver300=form_data['experienceHoursOver300'] == 'Yes',
-            experienceHoursBelow300=form_data.get('experienceHoursBelow300'),
-            status='Pending',
-            company=form_data['company'],
-            companyAddress=form_data['companyAddress'],
-            companyPhone=form_data['companyPhone'],
-            companyWebsite=form_data['companyWebsite'],
-            supervisorName=form_data['directSupervisor'],
-            supervisorPhone=form_data['supervisorPhone'],
-            supervisorEmail=form_data['supervisorEmail'],
-            created_at=form_data['date']
+            content_area = content_area,
+            **experience_type,
         )
         logging.info("Summer experience successfully saved.")
     except Exception as e:
diff --git a/app/models/individualRequirement.py b/app/models/individualRequirement.py
index c598f75a6..1ad47061e 100644
--- a/app/models/individualRequirement.py
+++ b/app/models/individualRequirement.py
@@ -18,7 +18,6 @@ class IndividualRequirement(baseModel):
     requirement = ForeignKeyField(CertificationRequirement)
     addedBy = ForeignKeyField(User)
     addedOn = DateTimeField(default=datetime.now)
-    # summer_experience = ForeignKeyField(SummerExperience, null=True)
 
     class Meta:
         constraints = [SQL('UNIQUE (username_id, requirement_id)')]
diff --git a/app/static/js/minorProfilePage.js b/app/static/js/minorProfilePage.js
index fded52334..18192b8c5 100644
--- a/app/static/js/minorProfilePage.js
+++ b/app/static/js/minorProfilePage.js
@@ -7,7 +7,6 @@ function callback(selected) {
 
 $(document).ready(function() {
   $("#searchStudentsInput").on("input", function() {
-    console.log("Input event triggered");
     searchUser("searchStudentsInput", callback);
   });
 
@@ -201,9 +200,9 @@ document.addEventListener('DOMContentLoaded', function() {
       })
       .catch(error => console.error('Error fetching terms:', error));
 
-  const editOtherButton = document.getElementById('edit-other-proposal-button');
-  const cancelOtherButton = document.getElementById('cancel-other-edit-button');
-  const withdrawOtherButton = document.getElementById('withdraw-other-button');
+  const editOtherButton = $('#edit-other-proposal-button');
+  const cancelOtherButton = $('#cancel-other-edit-button');
+  const withdrawOtherButton = $('#withdraw-other-button');
   const otherFormFields = document.querySelectorAll('#requestOtherCommEng input, #requestOtherCommEng select, #requestOtherCommEng textarea');
 
   editOtherButton.addEventListener('click', function() {
diff --git a/app/templates/minor/profile.html b/app/templates/minor/profile.html
index 38ac79e63..8d701b498 100644
--- a/app/templates/minor/profile.html
+++ b/app/templates/minor/profile.html
@@ -210,7 +210,7 @@ <h4> Supervisor Information </h4>
                     </div>
         
                     <div class="form-group">
-                        <label><strong>Whhhhhh of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
+                        <label><strong>Which of the following existing community-based experiences will you take part in during the summer? Please select one.</strong></label><br>
                         <input type="radio" id="internship" name="experienceType" value="Internship" {% if summer_experience.experienceType == 'Internship' %}checked{% endif %} required>
                         <label for="internship">Internship</label><br>
                         <input type="radio" id="cbr" name="experienceType" value="Community-based research" {% if summer_experience.experienceType == 'Community-based research' %}checked{% endif %}>
@@ -274,7 +274,7 @@ <h4> Supervisor Information </h4>
         
           {% else %}
           <!-- Display summer experience form -->
-          <form id='summer-experience-form' enctype="multipart/form-data" role='form' action="{{ url_for('minor.addASummerExperience', username=user.username) }}" method="POST">
+          <form id='summer-experience-form' enctype="multipart/form-data" role='form' action="{{ url_for('minor.addSummerExperience', username=user.username) }}" method="POST">
             <div class='row'>
                 <div class="container">
                     <div class='form-group mb-4 text-center'>