Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters

application/views/system/infocenter/infocenterDetails.php

@@ -57,7 +57,7 @@
 				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 					<div class="col-lg-8">
 						<h3 class="page-header">
-							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/studvw/stdsem/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">

cis/private/lehre/notenliste.xls.php

@@ -351,7 +351,7 @@ if (!$berechtigung->isBerechtigt('admin')
 					{
 						$worksheet->write($lines,3,$elem->vorname);
 					}
-					$worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
+					$worksheet->writeString($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
 					$worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight);
 					$worksheet->write($lines,6, $note, $format_highlightright);
 

include/vertrag.class.php

@@ -121,7 +121,7 @@ class vertrag extends basis_db
 											JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 										WHERE
 											vertrag_id=tbl_vertrag.vertrag_id
-											AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>=".$this->db_add_param($datum).")
+											AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>".$this->db_add_param($datum).")
 								)
 						)";
 		}

public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js

@@ -255,7 +255,7 @@ export default {
 							deleteButton.className = 'btn btn-outline-secondary';
 							const icon = document.createElement('i');
 							icon.className = 'fa fa-trash';
-							icon.title = this.$p.t('ui/loeschen');
+							icon.title = this.$p.t('lehre/info_deleteMarkEntry');
 							deleteButton.append(icon);
 							deleteButton.addEventListener('click', evt => {
 								evt.stopPropagation();

public/js/components/Stv/Studentenverwaltung/List.js

@@ -822,18 +822,33 @@ export default {
         @headerFilterOn="handleHeaderFilter"
       >
 
-    <!--
-      <template #actions>
-        <div>
-          <button
-          class="btn btn-outline-success sm mb-1"
-            :title="'Export ' + selectedPrestudents.length + ' prestudent(s) to Excel'"
-          >
-            <i class="fas fa-file-excel fa-xl"></i>
-          </button>
-        </div>
-       </template>
-     -->
+    
+    	<template #actions>
+			<!-- <div>
+			<button
+			class="btn btn-outline-success sm mb-1"
+				:title="'Export ' + selectedPrestudents.length + ' prestudent(s) to Excel'"
+			>
+				<i class="fas fa-file-excel fa-xl"></i>
+			</button>
+			</div> -->
+			<template v-if="filter.length || headerFilterActive">
+				<div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
+					<p class="text-danger mb-0">
+						<strong>{{$p.t('filter','filterActive')}}</strong>
+					</p>
+
+					<button
+						class="btn btn-outline-danger sm"
+						:title="$p.t('filter/filterDelete')"
+						@click="resetFilter"
+					>
+						<span class="fa-solid fa-filter-circle-xmark"></span>
+					</button>
+				</div>
+			</template>
+		</template>
+    
 
        <template #additional>
         <div class="pe-1">
@@ -873,22 +888,7 @@ export default {
                   <i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
           </button>
         </div>
-      </template>
-
-      <template v-if="filter.length || headerFilterActive">
-        <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
-          <p class="text-danger mb-0">
-            <strong>{{$p.t('filter','filterActive')}}</strong>
-          </p>
-
-          <button
-            class="btn btn-outline-danger sm"
-            :title="$p.t('filter/filterDelete')"
-            @click="resetFilter"
-          >
-            <span class="fa-solid fa-filter-circle-xmark"></span>
-          </button>
-        </div>
+		
       </template>
 
       <template #filter>

system/phrasesupdate.php

@@ -62411,6 +62411,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'info_deleteMarkEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noteneintrag entfernen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Remove grade entry',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );