Skip to content

Commit

Permalink
Merge branch 'development' into interested_students
Browse files Browse the repository at this point in the history
  • Loading branch information
@AravDe
AravDe authored Jul 16, 2024
2 parents 570b95e + 49ace32 commit 0fee56a
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 17 deletions.
8 changes: 8 additions & 0 deletions app/static/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,12 @@ select.empty {

.rsvp-btn{
padding-top: 4em;
}
.required::after {
content: " *";
color: red;
font-size: 1.3em; /* Adjust the font size as needed */
font-weight: bolder; /* make it bold */
vertical-align: middle; /* Align vertically with the text */
line-height: 1; /* Match the line height of the parent text */
}
6 changes: 6 additions & 0 deletions app/static/js/eventKiosk.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ $(document).ready(function(e) {
submitData();
}
});

// Click event for the Enter button
$("#enter-button").click(function() {
submitData();
});


// Opens the camera to scan the ID
$('.qr-reader-button').on("click", function() {
Expand Down
21 changes: 10 additions & 11 deletions app/templates/admin/createEvent.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set isNewEvent = 'create' in request.path %}
{% if isNewEvent %}
{% if eventData["program"].programName == 'CELTS-Sponsored Event' %}
{% set page_title = 'Create A ' + eventData["program"].programName %}
{% set page_title = 'Create a ' + eventData["program"].programName %}

{% elif template.tag == 'single-program' %}
{%set page_title = 'Create Event for ' + eventData["program"].programName %}
Expand Down Expand Up @@ -58,17 +58,16 @@ <h1>{{page_title}}</h1>
{% macro locationTimeMacro(eventData, isNewEvent, pageLocation) %}

<div class="form-group mb-4">
<label class="form-label" for='inputEventLocation-{{pageLocation}}'><strong>Location</strong></label>
<input class="form-control" id='inputEventLocation-{{pageLocation}}' placeholder="Enter location" name="location" required
<label class="required form-label" for='inputEventLocation-{{pageLocation}}'><strong>Location</strong></label>
<input class="form-control" id='inputEventLocation-{{pageLocation}}' placeholder="Enter location" name="location" required>
{% if eventData.location %}
value="{{eventData.location}}"
{% endif %}
/>
</div>
<!-- Start and End Datepickers -->
<div class="row col-md-12">
<div class="form-group col-md-6">
<label class="form-label me-2" for="startDatePicker-{{pageLocation}}"><strong>Start Date</strong></label>
<label class="required form-label me-2" for="startDatePicker-{{pageLocation}}"><strong>Start Date</strong></label>
<div class='input-group date startDate' id="startDate-{{pageLocation}}" data-page-location="{{pageLocation}}">
<input autocomplete="off" type='text' class="form-control datePicker startDatePicker readonly"
value="{{ eventData.startDate.strftime('%m/%d/%Y') if eventData.startDate and eventData.startDate.strftime else eventData.startDate}}"
Expand All @@ -82,7 +81,7 @@ <h1>{{page_title}}</h1>
<div class="form-group col-md-6 {{hideDate}} endDateStyle" id ="endDateStyle-{{pageLocation}}" >
<!--datePicker for End date-->
<span><i class="bi bi-calendar-plus-fill"></i></span>
<label class="form-label me-2" for="endDate-{{pageLocation}}" ><strong>End Date</strong></label>
<label class="required form-label me-2" for="endDate-{{pageLocation}}" ><strong>End Date</strong></label>
<div class='input-group date endDate' id="endDate-{{pageLocation}}" data-page-location="{{pageLocation}}">
<input autocomplete="off" type='text' class="form-control datePicker endDatePicker" id='endDatePicker-{{pageLocation}}'
value="{{eventData.endDate.strftime('%m/%d/%Y') if eventData.endDate and eventData.endDate.strftime else eventData.endDate}}"
Expand All @@ -106,9 +105,9 @@ <h1>{{page_title}}</h1>
{% else %}
{% set startTime = "12:00" %}
{% endif %}
<input autocomplete="off" type="time" class="form-control timepicker" value="{{startTime}}" name="timeStart"
<input autocomplete="off" type="time" class="form-control timepicker startTime" value="{{startTime}}" name="timeStart"
aria-describedby="timeIcon1" placeholder="Pick a start time"
class = "startTime" id="startTime-{{pageLocation}}" data-page-location="{{pageLocation}}" required />
id="startTime-{{pageLocation}}" data-page-location="{{pageLocation}}" required />
<span class="input-group-text timeIcons" id="timeIcon1-{{pageLocation}}" hidden><i class="bi bi-clock"></i></span>
</div>
</div>
Expand All @@ -120,7 +119,7 @@ <h1>{{page_title}}</h1>
{%else%}
{% set endTime = "13:00" %}
{% endif %}
<input autocomplete="off" type="time" class="form-control timepicker" value="{{endTime}}" name="timeEnd"
<input autocomplete="off" type="time" class="form-control timepicker endTime" value="{{endTime}}" name="timeEnd"
aria-describedby="timeIcon2" placeholder="Pick an end time"
class = "startTime" id="endTime-{{pageLocation}}" data-page-location="{{pageLocation}}" required />
<span class="input-group-text timeIcons" id="timeIcon2-{{pageLocation}}" hidden><i class="bi bi-clock"></i></span>
Expand All @@ -138,7 +137,7 @@ <h1>{{page_title}}</h1>
<input type="hidden" name="id" value="{{eventData.id}}">
{% endif %}
<div class="form-group mb-4">
<label class="form-label" for='inputEventName'><strong>Event Name</strong></label>
<label class="required form-label" for='inputEventName'><strong>Event Name</strong></label>
<input class="form-control" id='inputEventName' value="{{eventData.name}}" placeholder="Enter event name" name="name" required>
</div>
<div class="form-group mb-4">
Expand Down Expand Up @@ -216,7 +215,7 @@ <h1>{{page_title}}</h1>

<div class="col-md-6 form-group">
<div class="form-group mb-4">
<label class="form-label" for='inputCharacters'><strong>Description</strong></label>
<label class="required form-label" for='inputCharacters'><strong>Description</strong></label>
<textarea rows="5" cols="72" class="form-control" id="inputCharacters" type="text" placeholder="Enter event description" name="description" required>{{eventData.description}}</textarea>
<label class="form-label" id ="remainingCharacters"></label>
</div>
Expand Down
18 changes: 13 additions & 5 deletions app/templates/admin/manageServiceLearningFaculty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
{{super()}}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.css">
<link rel="stylesheet" href="{{url_for('static', filename ='css/manageServiceLearningFaculty.css')}}">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
{% endblock %}

{% block app_content %}
Expand Down Expand Up @@ -71,7 +72,14 @@ <h5 class="ms-3">There are no unapproved courses for {{ term.description }}.</h5
<td>{{ course.instructors }}</td>
<td>
<a class="status-key text-dark" id="statusKey" href="javascript:void(0);" data-toggle="popover"
title="Status" data-content="{{course.status.status}}">{{course.status.status}}</a>
title="status key" data-content="{{ course.status.status }}">
{% if course.status.status == 'In Progress' %}
<i class="fa-solid fa-circle-half-stroke" style="margin-right: 3px;"></i>
{% elif course.status.status == 'Submitted' %}
<i class="fa-solid fa-circle" style="margin-right: 3px;"></i>
{% endif %}
{{course.status.status}}
</a>
</td>
<td>
<select class="form-select courseData" id="{{course.id}}" onchange='changeAction(this)'>
Expand All @@ -86,8 +94,6 @@ <h5 class="ms-3">There are no unapproved courses for {{ term.description }}.</h5
</tbody>
</table>
{% endif %}


{########################### Approved Table #################################}
<h2>Approved</h2>
{% if approvedCourses | length == 0 %}
Expand All @@ -108,8 +114,10 @@ <h5 class="ms-3">There are no approved courses for {{ term.description }}.</h5>
<td>{{course.courseName}}</td>
<td>{{ course.instructors }}</td>
<td>
<a class="status-key text-dark" id="statusKey" href="javascript:void(0);" data-toggle="popover"
title="Status Key" data-content="{{course.status.status}}">{{course.status.status}}</a>
<a class="status-key text-dark" id="statuskey" href="javascript:void(0);" data-toggle="popover"
title="status key" data-content="{{ course.status.status }}">
<i class="fa-solid fa-circle-check" style="margin-right: 3px;"></i> {{ course.status.status }}
</a>
</td>
<td>
<select class="form-select" id="{{course.id}}" onchange='changeAction(this)'>
Expand Down
3 changes: 2 additions & 1 deletion app/templates/events/eventKiosk.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ <h2 class="m-5" align="center">{{ bNumberToUser }}</h2>
<div id="signinData" class="mx-auto px-5 mb-2">
<div class="input-group">
<input type="hidden" id="eventid" name="eventid" value="{{event.id}}" />
<input type="text" id="submitScannerData" name="bNumber" class="form-control input-lg"style="font-size: 2rem;" placeholder="Enter B#">
<input type="text" id="submitScannerData" name="bNumber" class="form-control input-lg"style="font-size: 1.5rem;" placeholder="Please Scan or Enter B# (Ex. B00000000)">
<button id ='enter-button' class="btn btn-primary btn-lg">Enter</button>
<button id ='camera-button' class="qr-reader-button btn-success btn-lg"><span class="bi bi-camera"></span></button>
</div>
<div id="qr-reader" style="display:none"></div>
Expand Down

0 comments on commit 0fee56a

Please sign in to comment.