Merge branch 'BC-5132-fix-course-until-date-bug' of github.com:hpi-sc…

…hul-cloud/schulcloud-client into BC-5132-fix-course-until-date-bug
hpi-schul-cloud · Sep 28, 2023 · c583017 · c583017
2 parents 45a0a5c + 683d6a0
commit c583017
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 89 deletions.
diff --git a/config/default.schema.json b/config/default.schema.json
@@ -592,6 +592,11 @@
 			"type": "boolean",
 			"default": false,
 			"description": "Changes the login flow to one that supports user login migrations"
+		},
+		"FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED": {
+			"type": "boolean",
+			"default": false,
+			"description": "Enables the new class list view"
 		}
 	},
 	"allOf": [

diff --git a/config/global.js b/config/global.js
@@ -39,6 +39,7 @@ const {
 	FEATURE_NEW_SCHOOL_ADMINISTRATION_PAGE_AS_DEFAULT_ENABLED,
 	FEATURE_ALERTS_ON_HOMEPAGE_ENABLED,
 	FEATURE_BUTTONS_ON_LOGINPAGE_ENABLED,
+	FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED,
 } = process.env;
 
 const exp = {
@@ -80,6 +81,7 @@ const exp = {
 	FEATURE_NEW_SCHOOL_ADMINISTRATION_PAGE_AS_DEFAULT_ENABLED,
 	FEATURE_ALERTS_ON_HOMEPAGE_ENABLED,
 	FEATURE_BUTTONS_ON_LOGINPAGE_ENABLED,
+	FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED,
 };
 
 // eslint-disable-next-line no-console

diff --git a/helpers/handlebars/middleware.js b/helpers/handlebars/middleware.js
diff --git a/locales/de.json b/locales/de.json
@@ -304,6 +304,7 @@
 		"dashboard": {
 			"headline": {
 				"manageClasses": "Klassen verwalten",
+				"manageClassesNew": "Klassen verwalten (neu)",
 				"manageCourses": "Kurse verwalten",
 				"manageSchool": "Schule verwalten",
 				"manageStudents": "Schüler:innen verwalten",
@@ -1751,6 +1752,7 @@
 				"addons": "Add-ons",
 				"administration": "Administration",
 				"administrationClasses": "Klassen",
+				"administrationClassesNew": "Klassen (neu)",
 				"administrationCourses": "Kurse"
 			}
 		},

diff --git a/locales/en.json b/locales/en.json
@@ -304,6 +304,7 @@
 		"dashboard": {
 			"headline": {
 				"manageClasses": "Manage classes",
+				"manageClassesNew": "Manage classes (new)",
 				"manageCourses": "Manage courses",
 				"manageSchool": "Manage school",
 				"manageStudents": "Manage students",
@@ -1751,6 +1752,7 @@
 				"addons": "Add-ons",
 				"administration": "Administration",
 				"administrationClasses": "Classes",
+				"administrationClassesNew": "Classes (new)",
 				"administrationCourses": "Courses"
 			}
 		},

diff --git a/locales/es.json b/locales/es.json
@@ -304,6 +304,7 @@
 		"dashboard": {
 			"headline": {
 				"manageClasses": "Administrar clases",
+				"manageClassesNew": "Administrar clases (nuevo)",
 				"manageCourses": "Administrar cursos",
 				"manageSchool": "Administrar escuela",
 				"manageStudents": "Administrar estudiantes",
@@ -1751,6 +1752,7 @@
 				"addons": "Complementos",
 				"administration": "Administración",
 				"administrationClasses": "Clases",
+				"administrationClassesNew": "Clases (nuevo)",
 				"administrationCourses": "Cursos"
 			}
 		},

diff --git a/locales/uk.json b/locales/uk.json
@@ -252,6 +252,7 @@
 			"link": {
 				"addons": "Доповнення",
 				"administrationClasses": "Класи",
+				"administrationClassesNew": "Класи (новий)",
 				"administrationCourses": "Курси",
 				"administration": "Адміністрація"
 			}
@@ -1285,6 +1286,7 @@
 		"dashboard": {
 			"headline": {
 				"manageClasses": "Керувати класами",
+				"manageClassesNew": "Керувати класами (нове)",
 				"manageCourses": "Керувати курсами",
 				"manageSchool": "Керувати школою",
 				"manageStudents": "Керувати учнями",

diff --git a/views/administration/dashboard.hbs b/views/administration/dashboard.hbs
@@ -58,6 +58,19 @@
 								</div>
 							</div>
 							{{/userHasPermission}}
+                            {{#userHasPermission 'CLASS_LIST'}}
+                                {{#if (getConfig "FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED")}}
+                                    <div class="col-md-6 col-sm-6 col-xs-12">
+                                        <div class="card h-100 teacher-option locationlink" data-loclink="/administration/groups/classes" data-testid="administrate_classes">
+                                            <div class="card-block homework">
+                                                <div class="card-text">
+                                                    <h2 class="h4"><i class="fa fa-users"></i> {{$t "administration.dashboard.headline.manageClassesNew" }}</h2>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                {{/if}}
+							{{/userHasPermission}}
 							{{#userHasPermission 'ADMIN_VIEW'}}
 								<div class="col-md-6 col-sm-6 col-xs-12">
 									<div class="card h-100 teacher-option locationlink" data-loclink="/administration/teams">