blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-09 08:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-15910/BPK_soll_mit_Berechtigung_im_FAS_sichtbar_editierbar_sein'

Browse Source
This commit is contained in:
Andreas Österreicher
2021-11-04 17:09:04 +01:00
parent da4d749cb7 dc95a9b0b0
commit 439d2dd999
5 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+2
View File
@@ -428,6 +428,7 @@ if(!$error)
$student->geburtsnation = $_POST['geburtsnation'];
$student->sprache = $_POST['sprache'];
$student->matrikelnr = $_POST['matrikelnummer'];
$student->bpk = $_POST['bpk'];
$student->updateamum = date('Y-m-d H:i:s');
$student->updatevon = $user;
@@ -577,6 +578,7 @@ if(!$error)
$person->geburtsnation = $_POST['geburtsnation'];
$person->sprache = $_POST['sprache'];
$person->matr_nr = $_POST['matr_nr'];
$person->bpk = $_POST['bpk'];
$person->updateamum = date('Y-m-d H:i:s');
$person->updatevon = $user;
content/student/studentdetailoverlay.xul.php
+6 -2
View File
@@ -31,7 +31,9 @@ require_once('../../include/variable.class.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
$user=get_uid();
$user = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($user);
$variable = new variable();
if(!$variable->loadVariables($user))
@@ -72,7 +74,9 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="Zugangscode" control="student-detail-zugangscode"/>
<label id="label-student-detail-link_bewerbungstool" hidden="true" value=""></label>
<label class="text-link" href="#" id="label-student-detail-zugangscode" value="" onclick="window.open(document.getElementById('label-student-detail-link_bewerbungstool').value)"/>
<?php $hideBpk = $rechte->isBerechtigt('student/bpk') ? '':' hidden="true"'; ?>
<label value="BPK" control="student-detail-textbox-bpk"<?php echo $hideBpk; ?>/>
<hbox><textbox id="student-detail-textbox-bpk" disabled="true" maxlength="28" size="30"<?php echo $hideBpk; ?>/></hbox>
</row>
<row>
<label value="Anrede" control="student-detail-textbox-anrede"/>
content/student/studentoverlay.js.php
+6
View File
@@ -704,6 +704,7 @@ function StudentDetailReset()
document.getElementById('student-detail-menulist-sprache').value='German';
document.getElementById('student-detail-textbox-matrikelnummer').value='';
document.getElementById('student-detail-textbox-matr_nr').value='';
document.getElementById('student-detail-textbox-bpk').value='';
document.getElementById('student-detail-image').src='';
}
@@ -742,6 +743,7 @@ function StudentDetailDisableFields(val)
document.getElementById('student-detail-textbox-alias').disabled=val;
document.getElementById('student-detail-button-save').disabled=val;
document.getElementById('student-detail-textbox-matr_nr').disabled=val;
document.getElementById('student-detail-textbox-bpk').disabled=val;
}
// ****
@@ -779,6 +781,7 @@ function StudentDetailSave()
gruppe = document.getElementById('student-detail-textbox-gruppe').value;
alias = document.getElementById('student-detail-textbox-alias').value;
matr_nr = document.getElementById('student-detail-textbox-matr_nr').value;
bpk = document.getElementById('student-detail-textbox-bpk').value;
//Wenn es noch kein Student ist, dann wird die Studiengang_kz vom Prestudent genommen
if(studiengang_kz=='')
@@ -836,6 +839,7 @@ function StudentDetailSave()
req.add('gruppe', gruppe);
req.add('alias', alias);
req.add('matr_nr',matr_nr);
req.add('bpk',bpk);
var response = req.executePOST();
@@ -1084,6 +1088,7 @@ function StudentAuswahl()
matr_nr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#matr_nr" ));
zugangscode=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zugangscode" ));
link_bewerbungstool=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#link_bewerbungstool" ));
bpk=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bpk" ));
//Bei Incoming wird das Menue zur Statusaenderung deaktiviert
if(status=='Incoming')
@@ -1130,6 +1135,7 @@ function StudentAuswahl()
document.getElementById('student-detail-textbox-matr_nr').value=matr_nr;
document.getElementById('label-student-detail-zugangscode').value=zugangscode;
document.getElementById('label-student-detail-link_bewerbungstool').value=link_bewerbungstool;
document.getElementById('student-detail-textbox-bpk').value=bpk;
//PreStudent Daten holen
rdf/student.rdf.php
+4 -1
View File
@@ -214,6 +214,7 @@ function draw_content_liste($row)
<STUDENT:status_datum_iso><![CDATA['.$datum_obj->formatDatum($prestudent->datum,'Y-m-d').']]></STUDENT:status_datum_iso>
<STUDENT:status_bestaetigung_iso><![CDATA['.($prestudent->bestaetigtam!=''?$datum_obj->formatDatum($prestudent->bestaetigtam,'Y-m-d'):'-').']]></STUDENT:status_bestaetigung_iso>
<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
<STUDENT:bpk><![CDATA['.$row->bpk.']]></STUDENT:bpk>
<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
<STUDENT:anmerkungpre>'.($row->anmerkung==''?'&#xA0;':'<![CDATA['.$row->anmerkung.']]>').'</STUDENT:anmerkungpre>
@@ -330,6 +331,7 @@ function draw_content($row)
<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.$mail_privat.']]></STUDENT:link_bewerbungstool>
<STUDENT:bpk><![CDATA['.$row->bpk.']]></STUDENT:bpk>
<STUDENT:aktiv><![CDATA['.$aktiv.']]></STUDENT:aktiv>
<STUDENT:uid><![CDATA['.(isset($row->uid)?$row->uid:'').']]></STUDENT:uid>
@@ -441,6 +443,7 @@ function draw_empty_content()
<STUDENT:mail_intern><![CDATA[]]></STUDENT:mail_intern>
<STUDENT:zugangscode><![CDATA[]]></STUDENT:zugangscode>
<STUDENT:link_bewerbungstool><![CDATA[]]></STUDENT:link_bewerbungstool>
<STUDENT:bpk><![CDATA[]]></STUDENT:bpk>
<STUDENT:aktiv><![CDATA[]]></STUDENT:aktiv>
<STUDENT:uid><![CDATA[]]></STUDENT:uid>
@@ -608,7 +611,7 @@ if($xmlformat=='rdf')
AS email_privat,
(SELECT rt_gesamtpunkte as punkte FROM public.tbl_prestudent WHERE prestudent_id=tbl_student.prestudent_id) as punkte,
tbl_prestudent.dual as dual, tbl_prestudent.reihungstest_id, tbl_prestudent.anmeldungreihungstest, p.matr_nr,
tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung, p.zugangscode
tbl_prestudent.gsstudientyp_kurzbz, tbl_prestudent.aufnahmegruppe_kurzbz, tbl_prestudent.priorisierung, p.zugangscode, p.bpk
FROM
public.tbl_student
JOIN public.tbl_benutzer ON (student_uid=uid)
system/dbupdate_3.3.php
+14
View File
@@ -5529,6 +5529,20 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
}
}
// Add permission to manage bpk in FAS
if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/bpk';"))
{
if($db->db_num_rows($result) == 0)
{
$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/bpk', 'BPK verwalten');";
if(!$db->db_query($qry))
echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
else
echo '<br>system.tbl_berechtigung: Added permission for student/bpk';
}
}
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';