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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
hainberg
2020-01-13 14:21:25 +01:00
parent bd055087cf 2859dfb17d
commit 7c2df5eefb
9 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
+13 -4
View File
@@ -131,7 +131,16 @@ class LehrauftragAkzeptieren extends Auth_Controller
if ($result = getData($this->BenutzerModel->getFromPersonId($result[0]->person_id)))
{
// * finally check uid of contract against the logged in user
if ($result[0]->uid != $this->_uid)
$account_found = false;
foreach($result as $row_accounts)
{
if($row_accounts->uid == $this->_uid)
{
$account_found = true;
}
}
if (!$account_found)
{
show_error('Keine Berechtigung für diesen Vertrag');
}
@@ -148,7 +157,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
// Set status to accepted
$result = $this->VertragvertragsstatusModel->setStatus($vertrag_id, $this->_uid, 'akzeptiert');
if ($result->retval)
{
$json []= array(
@@ -165,7 +174,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
}
}
}
/**
* Check if lectors latest active Verwendung has inkludierte Lehre
* - inkludierte_lehre is null OR 0: freelancer lector -> has NO inkludierte Lehre
@@ -175,7 +184,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
public function checkInkludierteLehre()
{
$result = $this->BisverwendungModel->getLast($this->_uid);
if (hasData($result))
{
$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
application/libraries/AuthLib.php
+2 -1
View File
@@ -378,7 +378,8 @@ class AuthLib
}
else // otherwise
{
$hta = $this->_createAuthObjByPerson(array('uid' => trim($_SERVER['PHP_AUTH_USER'])));
// NOTE: Username needs to be trimmed and lowered because htaccess is allowing login
$hta = $this->_createAuthObjByPerson(array('uid' => mb_strtolower(trim($_SERVER['PHP_AUTH_USER']))));
}
// Invalid credentials
application/libraries/TableWidgetLib.php
+1
View File
@@ -19,6 +19,7 @@ class TableWidgetLib
const SESSION_CHECKBOXES = 'checkboxes';
const SESSION_METADATA = 'datasetMetadata';
const SESSION_ROW_NUMBER = 'rowNumber';
const SESSION_TIMEOUT = 'sessionTimeout';
// Session dataset elements
const SESSION_DATASET = 'dataset';
application/widgets/TableWidget.php
+1 -1
View File
@@ -341,7 +341,7 @@ class TableWidget extends Widget
// To be always stored in the session, otherwise is not possible to load data from Filters controller
$this->tablewidgetlib->setSessionElement(TableWidgetLib::REQUIRED_PERMISSIONS, $this->_requiredPermissions);
// Renew or set the session expiring time
$this->filterwidgetlib->setSessionElement(TableWidgetLib::SESSION_TIMEOUT, strtotime('+'.$this->_sessionTimeout.' minutes', time()));
$this->tablewidgetlib->setSessionElement(TableWidgetLib::SESSION_TIMEOUT, strtotime('+'.$this->_sessionTimeout.' minutes', time()));
}
/**
cis/private/lehre/benotungstool/nachpruefungeintragen.php
+3
View File
@@ -170,7 +170,9 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
if($pr->getPruefungen($student_uid, "Termin1", $lvid, $stsem))
{
if ($pr->result)
{
$termin1 = 1;
}
else
{
$lvnote = new lvgesamtnote();
@@ -183,6 +185,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
else
{
$pr_note = 9;
$pr_punkte = '';
$benotungsdatum = $jetzt;
}
cis/private/lehre/pruefung/pruefung.js.php
+26 -22
View File
@@ -892,28 +892,31 @@ function saveReihung(terminId, lehrveranstaltung_id)
anmeldung.uid = v.id;
reihung.push(anmeldung);
});
$.ajax({
dataType: 'json',
url: "./pruefungsanmeldung.json.php",
type: "POST",
data: {
method: "saveReihung",
reihung: reihung
},
error: loadError,
success: function(data){
if(data.error === 'false' && data.result === true)
{
messageBox("message", "<?php echo $p->t('pruefung/reihunghErfolgreichGeaendert'); ?>", "green", "highlight", 1000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
}
showAnmeldungen(terminId, lehrveranstaltung_id);
}
});
if (reihung.length > 0) {
$.ajax({
dataType: 'json',
url: "./pruefungsanmeldung.json.php",
type: "POST",
data: {
method: "saveReihung",
reihung: reihung
},
error: loadError,
success: function(data){
if(data.error === 'false' && data.result === true)
{
messageBox("message", "<?php echo $p->t('pruefung/reihunghErfolgreichGeaendert'); ?>", "green", "highlight", 1000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
}
showAnmeldungen(terminId, lehrveranstaltung_id);
}
});
}
}
/**
@@ -1216,7 +1219,8 @@ function loadStudiensemester()
url: "./pruefungstermin.json.php",
type: "POST",
data: {
method: "loadStudiensemester"
method: "loadStudiensemester",
prevSemester: 5
},
error: loadError,
success: function(data){
cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+1 -1
View File
@@ -252,7 +252,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
<?php
echo '<select id="filter_studiensemester" onchange="loadPruefungStudiengang();" style="visibility: hidden;">';
$aktuellesSemester = $studiensemester->getaktorNext();
$studiensemester->getAll();
$studiensemester->getPlusMinus(null, 5);
foreach($studiensemester->studiensemester as $sem)
{
/*@var $sem studiensemester */
cis/private/lehre/pruefung/pruefungstermin.json.php
+7 -3
View File
@@ -61,7 +61,8 @@ switch($method)
case 'loadStudiensemester':
$studiensemester = new studiensemester();
$aktStudiensemester = $studiensemester->getaktorNext();
$data = loadStudiensemester($aktStudiensemester);
$prevSemester = empty($_POST["prevSemester"]) ? 0 : $_POST["prevSemester"];
$data = loadStudiensemester($aktStudiensemester, $prevSemester);
break;
case 'getPruefungsfensterByStudiensemester':
$studiensemester = new studiensemester();
@@ -223,12 +224,15 @@ function loadPruefungstypen($abschluss)
/**
* Lädt alle Studiensemester aus der Datenbank
* @param String $aktStudiensemester das Aktuelle Studiensemester
* @param int $prevSemester wie viele vergangene Semester sollen geladen werden
* @return Array
*/
function loadStudiensemester($aktStudiensemester = null)
function loadStudiensemester($aktStudiensemester = null, $prevSemester = 0)
{
$studiensemester = new studiensemester();
if($studiensemester->getAll())
$prevSemester == 0 ? $studiensemester->getAll() : $studiensemester->getPlusMinus(null, $prevSemester);
if(!empty($studiensemester->studiensemester))
{
$data['result']=$studiensemester->studiensemester;
if(!is_null($aktStudiensemester))
cis/testtool/admin/index.php
+1 -1
View File
@@ -966,7 +966,7 @@ if ($frage_id != '')
echo "<input type='button' value='3' onclick='document.getElementById(\"nummer\").value=\"3\";' />";
echo "<input type='button' value='4' onclick='document.getElementById(\"nummer\").value=\"4\";' /></td></tr>";
echo '<tr>';
echo "<td>Punkte:</td><td><input type='text' size='8' id='punkte' name='punkte' value='$vorschlag->punkte' />";
echo "<td>Punkte:</td><td><input type='text' size='8' id='punkte' name='punkte' value='$vorschlag->punkte' onchange='this.value = this.value.replace(/,/g, \".\")'/>";
echo "<input type='button' style='background-color:#FFBFBF' value='-1/2' onclick='document.getElementById(\"punkte\").value=\"-0.5\";' />";
echo "<input type='button' style='background-color:#FFBFBF' value='-1/3' onclick='document.getElementById(\"punkte\").value=\"-0.3333\";' />";
echo "<input type='button' value='-1' style='background-color:#FFBFBF' onclick='document.getElementById(\"punkte\").value=\"-1\";' />";