Profile UI for CCE Minor Experiences.

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")
 

app/controllers/minor/routes.py

@@ -1,15 +1,16 @@
-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 datetime import datetime 
 
 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
+from app.logic.minor import saveOtherEngagementRequest, setCommunityEngagementForUser, getSummerTerms, getSummerExperience, getEngagementTotal, createSummerExperience, getProgramEngagementHistory, getCourseInformation, getCommunityEngagementByTerm
 
 @minor_bp.route('/profile/<username>/cceMinor', methods=['GET'])
 def viewCceMinor(username):
@@ -22,13 +23,35 @@ def viewCceMinor(username):
     sustainedEngagementByTerm = getCommunityEngagementByTerm(username)
     selectedSummerTerm, summerExperience = getSummerExperience(username)
 
+    latestYear = datetime.now().year + 2
+
+    summerYears = [latestYear - i for i in range(5)]
+
     return render_template("minor/profile.html",
                             user = User.get_by_id(username),
+                            summerYears = summerYears, 
                             sustainedEngagementByTerm = sustainedEngagementByTerm,
                             summerExperience = summerExperience if summerExperience else "",
                             selectedSummerTerm = selectedSummerTerm,
                             totalSustainedEngagements = getEngagementTotal(sustainedEngagementByTerm),
-                            summerTerms = getSummerTerms())
+                            summerTerms = getSummerTerms(),
+                            allTerms = getSummerExperience(username))
+
+
+# ################################################## SUMMER EXPERIENCE START ###########################################################
+
+@minor_bp.route('/cceMinor/<username>/addSummerExperience', methods=['POST'])
+def createOrUpdateSummerExperience(username):
+    formData = request.form
+    try:
+        createSummerExperience(username, formData)
+        flash(f'Summer Experience successfully created by {username}', 'success')
+    except Exception as e:
+        flash(f'An error occurred while adding the summer experience: {e}', 'danger')
+        print(f'An error occurred while adding the summer experience: {e}')
+    return ""
+
+# ################################################## SUMMER EXPERIENCE END ###########################################################
 
 @minor_bp.route('/cceMinor/<username>/getEngagementInformation/<type>/<term>/<id>', methods=['GET'])
 def getEngagementInformation(username, type, id, term):
@@ -66,6 +89,9 @@ def requestOtherEngagement(username):
     user = User.get_by_id(username)
     terms = selectSurroundingTerms(g.current_term)
 
+    latestYear = datetime.now().year + 2 
+
+    summerYears = [latestYear - i  for i in range(5)]
 
     if request.method == 'POST':
         filename = None
@@ -83,16 +109,5 @@ def requestOtherEngagement(username):
 
     return render_template("/minor/requestOtherEngagement.html",
                             user=user,
+                            summerYears = summerYears,
                             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 ""

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,7 +16,33 @@
 from app.models.individualRequirement import IndividualRequirement
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.communityEngagementRequest import CommunityEngagementRequest
+from app.models.summerExperience import SummerExperience
+from app.models.otherExperience import OtherExperience
 
+def createSummerExperience(username, formData):
+    """
+        Given the username of the student and the formData which includes all of
+        the SummerExperience information, create a new SummerExperience object.
+    """
+    try:
+        user = User.get(User.username == username)
+        contentAreas = ', '.join(formData.getlist('contentArea')) # Combine multiple content areas
+
+        # Directly assign the experience type
+        experienceType = formData['experienceType'] if formData['experienceType'] != 'Other' else formData.get('otherExperienceDescription', '')
+        if experienceType == '':  # Check if the otherExperienceDescription is empty when required
+            raise ValueError("Other experience description is required.")
+        SummerExperience.create(
+            user=user,
+            contentAreas = contentAreas,
+            status="Pending",
+            **formData,
+        )
+    except Exception as e:
+        print(f"Error saving summer experience: {e}")
+        raise
+
+# ################################################
 def getEngagementTotal(engagementData):
     """ 
         Count the number of engagements (from all terms) that have matched with a requirement 

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):

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()

app/models/summerExperience.py

@@ -0,0 +1,23 @@
+import datetime
+from app.models import *
+from app.models.user import User
+
+class SummerExperience(baseModel):
+    user = ForeignKeyField(User)
+    summerYear = CharField()
+    roleDescription = TextField()
+    experienceType = CharField()
+    contentAreas = TextField()  # Store as comma-separated values or use a related table if needed
+    isOver300Hours = BooleanField()
+    status = CharField(constraints=[Check("status in ('Approved', 'Pending', 'Denied')")], default='Pending')
+    orgName= CharField()
+    orgAddress = CharField()
+    hoursNotOver300 = IntegerField(null=True)
+    weeksNotOver300 = IntegerField(null=True)
+    orgPhone = CharField()
+    orgWebsite = CharField()
+    supervisorName = CharField()
+    supervisorPhone = CharField()
+    supervisorEmail = CharField()
+    createdOn = DateTimeField(default=datetime.datetime.now)
+

app/static/js/minorProfilePage.js

@@ -0,0 +1,66 @@
+$(document).ready(function() {
+  $('#hoursBelow300Container').hide()
+  $('#otherExperienceDescription').hide()
+
+  $('input.phone-input').inputmask('(999)-999-9999')
+  $('input.phone-input').on('input', function(){
+      let matches = $(this).val().match(/\d/g);
+      let digits = matches?matches.length:0;
+      if (digits == 0 || digits == 10){
+          this.setCustomValidity('')
+      }
+      else{
+          this.setCustomValidity('Please enter a valid phone number.')    
+          this.reportValidity()        
+      }
+  })
+  $("input[name='experienceType']").on("change", function() {
+    toggleOtherExperienceTextarea();
+  });
+
+  $("input[name='experienceHoursOver300']").on("change", function() {
+    toggleUnder300HoursTextarea();
+  });
+
+  function toggleUnder300HoursTextarea() {
+    var yesRadio = $('#yes300hours');
+    var conditionalTextBox = $('#hoursBelow300Container');
+    if (yesRadio.is(':checked')) {
+      conditionalTextBox.hide()
+    } else {
+      conditionalTextBox.show() 
+    }
+  }
+
+  function toggleOtherExperienceTextarea() {
+    var otherRadio = $('#otherExperience');
+    var conditionalTextBox = $('#otherExperienceDescription');
+    if (otherRadio.is(':checked')) {
+      conditionalTextBox.show()
+    } else {
+      conditionalTextBox.hide()
+    }
+  }
+
+  $('#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-summerExperience').html(response);
+        $('#summerExperience').tab('show');
+        location.reload()
+      },
+      error: function(xhr, status, error) {
+        console.error('Error:', error);
+      }
+    });
+  });
+})

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">

app/templates/base.html

@@ -96,6 +96,8 @@
   <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>
+
+
 {% endblock %}
 
 </html>

app/templates/minor/companyOrganizationInformation.html

@@ -0,0 +1,30 @@
+<div class="form-group">
+    <br>
+    <h4>Company/Organization Information</h4>
+    <hr>
+</div>
+
+<div class="form-group">
+    <label class="form-label" for="orgName"><strong>Name</strong></label>
+    <input class="form-control" id="orgName" name="orgName" placeholder="Company or organization's name" required/>
+</div>
+
+<br>
+
+<div class="form-group">
+    <label class="form-label" for="orgAddress"><strong>Address</strong></label>
+    <input class="form-control" id="orgAddress" name="orgAddress" placeholder="Company or organization's physical address" required/>
+</div>
+
+<br>
+
+<div class="row">
+    <div class="form-group col-6">
+        <label class="form-label" for="orgPhone"><strong>Phone Number</strong></label>
+        <input class="form-control phone-input" type="text" id="orgPhone" name="orgPhone" placeholder="Company or organization's phone number" required/>
+    </div>
+    <div class="form-group col-6">
+        <label class="form-label" for="orgWebsite"><strong>Website</strong></label>
+        <input class="form-control" id="orgWebsite" name="orgWebsite" placeholder="Company or organization's website" required/>
+    </div>
+</div>