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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred
2021-09-07 15:07:07 +02:00
parent 261e4066c8 89209a0c27
commit fedc8dbd59
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/AjaxLib.js
+20 -4
View File
@@ -391,9 +391,21 @@ var FHC_AjaxClient = {
* @returns {boolean}
* @private
*/
_hasFileList(controllerParameters){
_hasFileList: function(controllerParameters)
{
// Loop through controllerParameters
for (key in controllerParameters)
{
// When FileList is found ( parameter with uploaded file(s))
if (controllerParameters[key] instanceof FileList)
{
return true;
}
}
/*
return Object.values(controllerParameters)
.some((value) => value instanceof FileList === true);
*/
},
/**
@@ -409,14 +421,18 @@ var FHC_AjaxClient = {
const formData = new FormData();
// Loop through controllerParameters
for (const [key, value] of Object.entries(controllerParameters)) {
for (key in controllerParameters)
{
var value = controllerParameters[key];
// When FileList is found ( parameter with uploaded file(s))
if (value instanceof FileList)
{
// Loop through uploaded files
for (let file of value)
//for (let file of value)
//for (var file of value)
for (var filekey in value)
{
var file = value[filekey];
// Append file to FormData object (if more than 1 file, append as array)
formData.append(value.length == 1 ? key : key + '[]', file);
}
rdf/anrechnung.rdf.php
+13 -10
View File
@@ -28,24 +28,27 @@ $anrechnung = new anrechnung();
if(is_numeric($anrechnung_id))
{
$anrechnung->getAnrechnung($anrechnung_id);
// Add last Anrechnungstatus
$anrechnungstatus = new Anrechnung();
$anrechnungstatus->getLastAnrechnungstatus($anrechnung_id);
$anrechnung->result[0]->status = $anrechnungstatus->result[0]->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
}
elseif(is_numeric($prestudent_id))
{
$anrechnung->getAnrechnungPrestudent($prestudent_id);
// Add last Anrechnungstatus to each Anrechnung of Prestudent
foreach ($anrechnung->result as $row)
{
$anrechnungstatus = new Anrechnung();
$status = $anrechnungstatus->getLastAnrechnungstatus($row->anrechnung_id);
$row->status = $anrechnungstatus->result[0]->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
}
if(is_array($anrechnung->result))
{
foreach ($anrechnung->result as $row)
{
$anrechnungstatus = new Anrechnung();
$status = $anrechnungstatus->getLastAnrechnungstatus($row->anrechnung_id);
$row->status = $anrechnungstatus->result[0]->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE];
}
}
}
else
{
@@ -103,4 +106,4 @@ if(is_array($anrechnung->result))
?>
</RDF:Seq>
</RDF:RDF>
</RDF:RDF>