diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 75478332f..9cc604184 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/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'])
]);
diff --git a/content/statistik/notenspiegel.php b/content/statistik/notenspiegel.php
index 1a7651296..0901b834f 100644
--- a/content/statistik/notenspiegel.php
+++ b/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');
diff --git a/content/statistik/notenspiegel_erweitert.php b/content/statistik/notenspiegel_erweitert.php
index 2849a1895..67097ed22 100644
--- a/content/statistik/notenspiegel_erweitert.php
+++ b/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');
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index f2ddab036..4931a15ba 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/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))
{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index a51342c7c..63b80ba37 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/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 {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index b9a237fba..084b5daad 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -396,8 +396,8 @@ export default {
-
-
+
+
diff --git a/system/phpinfo.php b/system/phpinfo.php
deleted file mode 100644
index c18f4c6d5..000000000
--- a/system/phpinfo.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e1568b97e..4e538f172 100644
--- a/system/phrasesupdate.php
+++ b/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(