Merge branch 'feature-69065/Projektarbeiten_Firmen_verwalten' into demo-cis40

application/controllers/api/frontend/v1/stv/Projektarbeit.php

@@ -268,10 +268,6 @@ class Projektarbeit extends FHCAPI_Controller
 	{
 		$this->form_validation->set_data($formData);
 
-		$this->form_validation->set_rules('titel', 'Titel', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
-		]);
-
 		$this->form_validation->set_rules('projekttyp_kurzbz', 'Projekttyp', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);

content/statistik/notenspiegel.php

@@ -62,6 +62,11 @@ if(!$rechte->isBerechtigt('student/noten',$studiengang_kz, 's'))
 $semester = isset($_GET['semester'])?$_GET['semester']:'';
 $typ = isset($_GET['typ'])?$_GET['typ']:'';
 
+if(isset($_GET['studiensemester']) && preg_match('/[WS]S[0-9]{4}/', $_GET['studiensemester']))
+{
+	$semester_aktuell = $_GET['studiensemester'];
+}
+
 if($semester=='')
 	die('Bitte ein Semester auswaehlen');
 	

content/statistik/notenspiegel_erweitert.php

@@ -64,6 +64,11 @@ if (!$rechte->isBerechtigt('student/noten', $studiengang_kz, 's'))
 $semester = isset($_GET['semester']) ? $_GET['semester'] : '';
 $typ = isset($_GET['typ']) ? $_GET['typ'] : '';
 
+if(isset($_GET['studiensemester']) && preg_match('/[WS]S[0-9]{4}/', $_GET['studiensemester']))
+{
+	$semester_aktuell = $_GET['studiensemester'];
+}
+
 if ($semester == '')
 	die('Bitte ein Semester auswaehlen');
 

public/js/components/Stv/Studentenverwaltung.js

@@ -158,6 +158,7 @@ export default {
 						+ 'content/statistik/notenspiegel.php?type=xls'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_xls'
 				});
@@ -166,6 +167,7 @@ export default {
 						+ 'content/statistik/notenspiegel_erweitert.php?typ=xls'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_xls_extended'
 				});
@@ -174,6 +176,7 @@ export default {
 						+ 'content/statistik/notenspiegel.php?type=html'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_html'
 				});
@@ -186,8 +189,15 @@ export default {
 		'url_studiensemester_kurzbz': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
 				this.studiensemesterKurzbz = newVal;
-				this.$refs.stvList.updateUrl();
-				this.$refs.details.reload();
+				if(this.$route.name === 'search')
+				{
+					this.handleSearchUrl();
+				}
+				else
+				{
+					this.$refs.stvList.updateUrl();
+					this.$refs.details.reload();
+				}
 			}
 		},
 		'url_studiengang': function (newVal, oldVal) {
@@ -295,9 +305,6 @@ export default {
 					studiensemester_kurzbz: v
 				}
 			});
-
-			this.$refs.stvList.updateUrl();
-			this.$refs.details.reload();
 		},
 		reloadList() {
 			this.$refs.stvList.reload();
@@ -322,26 +329,29 @@ export default {
 					true
 					);
 			} else if (this.$route.params.searchstr) {
-				const searchsettings = {
-					searchstr: this.$route.params.searchstr,
-					types: this.$route.params.types?.split('+') || []
-				};
-
-				// init into student list
-				this.$refs.stvList.updateUrl(
-					ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
-				);
-
-				// init into searchbar
-				this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
-				this.$refs.searchbar.searchsettings.types = searchsettings.types;
-				this.$nextTick(this.blurSearchbar);
+				this.handleSearchUrl();
 			}
 			else
 			{
 				this.clearTabulator();
 			}
 		},
+		handleSearchUrl() {
+			const searchsettings = {
+				searchstr: this.$route.params.searchstr,
+				types: this.$route.params.types?.split('+') || []
+			};
+
+			// init into student list
+			this.$refs.stvList.updateUrl(
+				ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
+			);
+
+			// init into searchbar
+			this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
+			this.$refs.searchbar.searchsettings.types = searchsettings.types;
+			this.$nextTick(this.blurSearchbar);
+		},
 		clearTabulator() {
 			if(['index', 'studiensemester'].includes(this.$route.name))
 			{

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js

@@ -40,6 +40,9 @@ export default {
 			}
 
 			return lehreinheiten;
+		},
+		firmenverwaltungLink(){
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'vilesci/stammdaten/firma_frameset.html';
 		}
 	},
 	props: {
@@ -255,18 +258,25 @@ export default {
 
 
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-projektarbeit-firma"
-						:label="$p.t('projektarbeit', 'firma')"
-						type="autocomplete"
-						optionLabel="name"
-						v-model="formData.firma"
-						name="firma"
-						:suggestions="filteredFirmen"
-						@complete="searchFirma"
-						:min-length="3"
-						>
-					</form-input>
+					<div class="col-10">
+						<form-input
+							container-class="stv-details-projektarbeit-firma"
+							:label="$p.t('projektarbeit', 'firma')"
+							type="autocomplete"
+							optionLabel="name"
+							v-model="formData.firma"
+							name="firma"
+							:suggestions="filteredFirmen"
+							@complete="searchFirma"
+							:min-length="3"
+							>
+						</form-input>
+					</div>
+					<div class="col-2 align-content-center">
+						<a :href="firmenverwaltungLink" target="_blank">
+							{{ $p.t('projektarbeit', 'zurFirmenverwaltung') }}
+						</a>
+					</div>
 				</div>
 
 				<div class="row mb-3">

public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js

@@ -396,8 +396,8 @@ export default {
 
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
-					<button v-if="!statusNew && activeTab == 'details'" class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-if="!statusNew && activeTab == 'details'" class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
 			</template>
 
 		</bs-modal>

system/phpinfo.php

@@ -1,3 +0,0 @@
-<?php
-	phpinfo();
-?>

system/phrasesupdate.php

@@ -52225,6 +52225,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'zurFirmenverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zur Firmenverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Company management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
 	array(