diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 717561589..0bac8794f 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -412,6 +412,8 @@ class AntragJob extends JOB_Controller
$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
$this->StudierendenantragModel->addSelect('s.insertamum');
$this->StudierendenantragModel->addSelect('s.insertvon');
+ $this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id');
+ $this->StudierendenantragModel->addSelect('pts.student_uid');
$this->StudierendenantragModel->db->where_in(
'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
@@ -484,7 +486,7 @@ class AntragJob extends JOB_Controller
$person = current(getData($result));
$email = $studiengang->email;
$dataMail = array(
- 'prestudent' => $antrag->prestudent_id,
+ 'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id,
'studiensemester' => $antrag->studiensemester_kurzbz,
'name' => trim($person->vorname . ' '. $person->nachname),
);
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3a3f0be78..acb27977a 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -54,6 +54,7 @@ require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php');
require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php');
require_once('dbupdate_3.4/34543_ux_template.php');
require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
+require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '
Pruefe Tabellen und Attribute!
';
diff --git a/system/dbupdate_3.4/28575_softwarebereitstellung.php b/system/dbupdate_3.4/28575_softwarebereitstellung.php
new file mode 100644
index 000000000..9cccc77fa
--- /dev/null
+++ b/system/dbupdate_3.4/28575_softwarebereitstellung.php
@@ -0,0 +1,16 @@
+db_query("SELECT 1 FROM system.tbl_app WHERE app='softwarebereitstellung'"))
+{
+ if($db->db_num_rows($result) === 0)
+ {
+ $qry = "INSERT INTO system.tbl_app (app) VALUES('softwarebereitstellung');";
+
+ if(!$db->db_query($qry))
+ echo 'System Tabelle app: '.$db->db_last_error().'
';
+ else
+ echo '
app softwarebereitstellung hinzugefuegt
';
+ }
+}
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index bc67e9dae..fa8a361f4 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1296,6 +1296,8 @@ $filters = array(
{"name": "beschreibung"},
{"name": "hersteller"},
{"name": "os"},
+ {"name": "lizenzserver_kurzbz"},
+ {"name": "lizenzserver_port"},
{"name": "softwarestatus_kurzbz"}
],
"filters": []
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8baf66909..20f155afe 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25539,6 +25539,46 @@ array(
)
)
),
+ array(
+ 'app' => 'softwarebereitstellung',
+ 'category' => 'global',
+ 'phrase' => 'lizenzserverPort',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Lizenzserver Port',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'License server port',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'softwarebereitstellung',
+ 'category' => 'global',
+ 'phrase' => 'raumSwZuordnung',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Raum-/SW-Zuordnung',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Location-/SW Assignment',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'softwarebereitstellung',
'category' => 'global',