Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize enrollment spelling #357

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Standardize enrollment spelling #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...x/features/wikimedia_features/admin_dashboard/static/admin_dashboard/js/course_reports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@
placeholder: "Browse Courses",
});

$('#select-enrolment-year').change(function (e) {
$('#select-enrollment-year').change(function (e) {
e.preventDefault();
const today = new Date();
const selected_year = Number($(this).val())
const current_year = today.getFullYear()
var quarters = 4;

var quarter_select = $("#select-enrolment-quarter")
var quarter_select = $("#select-enrollment-quarter")
quarter_select.empty()

if(!selected_year){
Expand Down Expand Up @@ -315,10 +315,10 @@
AjaxCall(url_for_average_calculate_grades);
})
$("[name='courses-enrollments-csv']").click(function() {
let url_for_courses_enrolment_report = $(this).attr('data-endpoint');
let year = $('#select-enrolment-year').val()
let quarter = $('#select-enrolment-quarter').val()
AjaxCall(url_for_courses_enrolment_report, {year: Number(year), quarter: Number(quarter)});
let url_for_courses_enrollment_report = $(this).attr('data-endpoint');
let year = $('#select-enrollment-year').val()
let quarter = $('#select-enrollment-quarter').val()
AjaxCall(url_for_courses_enrollment_report, {year: Number(year), quarter: Number(quarter)});
})
$("[name='all-courses-enrollments-csv']").click(function() {
let data_url = $(this).attr('data-endpoint');
Expand Down
6 changes: 3 additions & 3 deletions ...x/features/wikimedia_features/admin_dashboard/templates/course_report/course-reports.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@
<span class="info-text">${_("Generate a report for last quarter enrollments of all courses.")}</span>
</td>
<td class="d-flex align-items-center p-3">
<select name="enrolment-year" id="select-enrolment-year" class="quarterly-selector">
<select name="enrollment-year" id="select-enrollment-year" class="quarterly-selector">
<option value="">${_("Select Year")}</option>
%for year in year_options:
<option value=${year}>${year}</option>
%endfor
</select>
<select name="enrolment-quarter" id="select-enrolment-quarter" class="ml-1 quarterly-selector">
<select name="enrollment-quarter" id="select-enrollment-quarter" class="ml-1 quarterly-selector">
<option value="">${_("Select Quarter")}</option>
</select>
</td>
Expand All @@ -196,7 +196,7 @@
<tr class="all-courses-report">
<td>
<span class="text">${_("All Courses Enrollement Report")}</span>
<span class="info-text">${_("Generate an all time report of enrolment/completion for all courses.")}</span>
<span class="info-text">${_("Generate an all time report of enrollment/completion for all courses.")}</span>
</td>
<td></td>
<td class="action">
Expand Down