Merge branch 'main' into BC-4913-Remove-passage-on-user-refistration

hpi-schul-cloud · Sep 1, 2023 · 36cc171 · 36cc171
2 parents 25988b1 + b81679e
commit 36cc171
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 65 deletions.
diff --git a/controllers/administration.js b/controllers/administration.js
@@ -1737,17 +1737,15 @@ router.get(
 					$sort: 'lastName',
 					$limit: false,
 				});
-				const yearsPromise = getSelectOptions(req, 'years', { $limit: false });
 
 				const usersWithConsentsPromise = getUsersWithoutConsent(req, 'student', currentClass._id);
 
 				Promise.all([
 					classesPromise,
 					teachersPromise,
 					studentsPromise,
-					yearsPromise,
 					usersWithConsentsPromise,
-				]).then(([classes, teachers, students, schoolyears, allUsersWithoutConsent]) => {
+				]).then(([classes, teachers, students, allUsersWithoutConsent]) => {
 					const isAdmin = res.locals.currentUser.permissions.includes(
 						'ADMIN_VIEW',
 					);
@@ -1849,7 +1847,6 @@ router.get(
 						teachers,
 						students: filterStudents(res, students),
 						schoolUsesLdap: res.locals.currentSchoolData.ldapSchoolIdentifier,
-						schoolyears,
 						notes,
 						referrer: '/administration/classes/',
 						consentsMissing: usersWithoutConsent.length !== 0,
@@ -2101,16 +2098,14 @@ router.get(
 		const schoolYears = res.locals.currentSchoolData.years.schoolYears
 			.sort((a, b) => b.startDate.localeCompare(a.startDate));
 		const lastDefinedSchoolYear = (schoolYears[0] || {})._id;
-		const currentYear = res.locals.currentSchoolData.currentYear;
-
-		const currentYearObj = schoolYears.filter((year) => year._id === currentYear).pop();
 
 		const showTab = (req.query || {}).showTab || 'current';
 
+		const currentYear = res.locals.currentSchoolData.currentYear;
 		const upcomingYears = schoolYears
-			.filter((year) => year.startDate > currentYearObj.endDate);
+			.filter((year) => year.startDate > currentYear.endDate);
 		const archivedYears = schoolYears
-			.filter((year) => year.endDate < currentYearObj.startDate);
+			.filter((year) => year.endDate < currentYear.startDate);
 
 		let defaultYear;
 		switch (showTab) {
@@ -2123,7 +2118,7 @@ router.get(
 				break;
 			case 'current':
 			default:
-				query['year[$in]'] = [currentYear];
+				query['year[$in]'] = [currentYear._id];
 				break;
 		}
 
@@ -2138,7 +2133,7 @@ router.get(
 			},
 			{
 				key: 'current',
-				title: `${currentYearObj.name}`,
+				title: `${currentYear.name}`,
 				link: `/administration/classes/?showTab=current${filterQueryString}`,
 			},			{
 				key: 'archive',
@@ -2217,7 +2212,7 @@ router.get(
 				};
 
 				const years = schoolYears
-					.filter((year) => year.endDate < currentYearObj.startDate)
+					.filter((year) => year.endDate < currentYear.startDate)
 					.map((year) => [
 						year._id,
 						year.name,
@@ -2814,7 +2809,7 @@ router.use(
 		const [school, totalStorage, schoolMaintanance, consentVersions] = await Promise.all([
 			api(req).get(`/schools/${res.locals.currentSchool}`, {
 				qs: {
-					$populate: ['systems', 'currentYear', 'federalState'],
+					$populate: ['systems', 'federalState'],
 					$sort: req.query.sort,
 				},
 			}),

diff --git a/static/scripts/administration.js b/static/scripts/administration.js
@@ -52,7 +52,6 @@ $(document).ready(() => {
 	const $addPolicyModal = $('.add-modal--policy');
 	const $editModal = $('.edit-modal');
 	const $invitationModal = $('.invitation-modal');
-	const $importModal = $('.import-modal');
 	const $deleteSystemsModal = $('.delete-modal');
 	const $deleteRSSModal = $('.delete-modal--rss');
 

diff --git a/static/scripts/administration/classes/manage.js b/static/scripts/administration/classes/manage.js
@@ -1,7 +1,5 @@
 import printQRs from '../../helpers/printQRs';
 
-/* globals populateModalForm */
-
 window.addEventListener('load', () => {
 	document
 		.getElementById('filter_schoolyear')
@@ -31,27 +29,6 @@ window.addEventListener('load', () => {
 			}
 		});
 
-	const $importModal = $('.import-modal');
-
-	$importModal.find('.btn-submit').on('click', async (event) => {
-		event.preventDefault();
-		const selections = $('#student_from_class_import')
-			.val();
-		const requestUrl = `/administration/classes/students?classes=${encodeURI(
-			JSON.stringify(selections),
-		)}`;
-		$importModal.modal('hide');
-		const res = await fetch(requestUrl, {
-			credentials: 'same-origin',
-		});
-		const students = await res.json();
-		students.forEach((student) => {
-			document.querySelector(
-				`option[value="${student._id}"]`,
-			).selected = true;
-		});
-	});
-
 	function btnSendLinksEmailsHandler(e) {
 		e.preventDefault();
 		const $this = $(this);

diff --git a/views/administration/forms/form-classes-manage.hbs b/views/administration/forms/form-classes-manage.hbs
@@ -123,32 +123,4 @@
     </div>
 </div>
 
-{{#embed "lib/components/modal-form" class="import-modal"}}
-    {{#content "fields"}}
-
-        <div class="form-group">
-            <label for="filter_schoolyear">{{$t "administration.classes.label.filterBySchoolYear" }}</label>
-            <select id="filter_schoolyear" name="classes" data-placeholder="{{$t "administration.classes.label.filterBySchoolYear" }}">
-                <option value="" selected>{{$t "administration.classes.label.all" }}</option>
-                {{#each schoolyears}}
-                    <option value="{{this._id}}">
-                        {{this.name}}
-                    </option>
-                {{/each}}
-            </select>
-            <p>{{$t "administration.classes.text.attentionIfYouChangeTheSchoolYear" }}</p>
-        </div>
-        <div class="form-group">
-            <label for="student_from_class_import">{{$t "administration.classes.label.addStudentFromPreviousYearClass" }}</label>
-            <select id="student_from_class_import" name="classes" multiple data-placeholder="{{$t "administration.global.placeholder.selectOldClasses" }}">
-                {{#each classes}}
-                    <option value="{{this._id}}" {{#if this.selected}}selected{{/if}}>
-                        {{this.displayName}}
-                    </option>
-                {{/each}}
-            </select>
-        </div>
-    {{/content}}
-{{/embed}}
-
 {{#embed "lib/components/modal-cancel" class="cancel-modal"}}{{/embed}}