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

Aliqoute Reduktion zeigt nun an ob ein Interviewbogen vorhanden/akzeptiert ist

Browse Source
This commit is contained in:
oesi
2016-04-25 16:00:48 +02:00
parent 197064d44d
commit 7bee4b02b7
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/personen/aliquote_reduktion.json.php
+34 -1
View File
@@ -65,6 +65,25 @@ switch($action)
$prestudent = new prestudent();
$return = $prestudent->getAllStudentenFromStudienplanAndStudsem($studienplan_id, $studiensemester_kurzbz, $studiengang_kz);
$db = new basis_db();
foreach($return as $key=>$value)
{
$qry = "SELECT
*
FROM
public.tbl_dokumentprestudent
WHERE
prestudent_id=".$db->db_add_param($value->prestudent_id)."
AND dokument_kurzbz=".$db->db_add_param('IvBo'.$value->studiengang_kz);
if($result_dok = $db->db_query($qry))
{
if($db->db_num_rows($result_dok)>0)
$return[$key]->interviewbogen=true;
else
$return[$key]->interviewbogen=false;
}
}
returnAJAX(true,json_encode($return));
break;
@@ -148,11 +167,13 @@ switch($action)
$worksheet->write($zeile,++$spalte,'Vorname',$format_bold);
$maxlength[$spalte]=7;
$worksheet->write($zeile,++$spalte,'ZGV Gruppe',$format_bold);
$maxlength[$spalte]=8;
$maxlength[$spalte]=10;
$worksheet->write($zeile,++$spalte,'Reihung',$format_bold);
$maxlength[$spalte]=8;
$worksheet->write($zeile,++$spalte,'RT Gesamt',$format_bold);
$maxlength[$spalte]=8;
$worksheet->write($zeile,++$spalte,'Interviewbogen',$format_bold);
$maxlength[$spalte]=14;
$worksheet->write($zeile,++$spalte,'Status',$format_bold);
$maxlength[$spalte]=8;
$worksheet->write($zeile,++$spalte,'Auswahl',$format_bold);
@@ -207,6 +228,18 @@ switch($action)
$maxlength[$spalte]=mb_strlen("");
}
if(isset($s->interviewbogen))
{
$worksheet->write($zeile,++$spalte, ($s->interviewbogen?'vorhanden':'nicht vorhanden'));
if(mb_strlen(($s->interviewbogen?'vorhanden':'nicht vorhanden'))>$maxlength[$spalte])
$maxlength[$spalte]=mb_strlen(($s->interviewbogen?'vorhanden':'nicht vorhanden'));
}
else
{
$worksheet->write($zeile,++$spalte, "");
if(mb_strlen("")>$maxlength[$spalte])
$maxlength[$spalte]=mb_strlen("");
}
$worksheet->write($zeile,++$spalte, $s->laststatus);
if(mb_strlen($s->laststatus)>$maxlength[$spalte])
$maxlength[$spalte]=mb_strlen($s->laststatus);
vilesci/personen/aliquote_reduktion.php
+4
View File
@@ -402,6 +402,7 @@
<th ts-criteria="bezeichnung">ZGV Gruppe</th>
<th ts-criteria="seqPlace|parseInt" ts-default="ascending">Reihung</th>
<th ts-criteria="rt_gesamtpunkte|parseFloat" ts-default="ascending">RT Gesamt</th>
<th ts-criteria="interviewbogen">Interviewbogen</th>
<th ts-criteria="laststatus">Status</th>
<th ng-if="aqr.selectedStudienplatz.apz">{{aqr.choosenStuds}}/{{aqr.selectedStudienplatz.apz}}</th>
<th ng-if="!aqr.selectedStudienplatz.apz">{{aqr.choosenStuds}}/Keine APZ</th>
@@ -416,6 +417,7 @@
<td ng-if="!stud.bezeichnung" style="font-weight: bold;">Keine Angabe</td>
<td>{{stud.seqPlace}}</td>
<td>{{stud.rt_gesamtpunkte}}</td>
<td>{{stud.interviewbogen?'vorhanden':'nicht vorhanden'}}</td>
<td>{{stud.laststatus}}</td>
<td>
<input ng-if="stud.applicant" type="checkbox" ng-model="stud.selected"/>
@@ -438,6 +440,7 @@
<th ts-criteria="bezeichnung">ZGV Gruppe</th>
<th ts-criteria="seqPlace|parseInt" ts-default="ascending">Reihung</th>
<th ts-criteria="rt_gesamtpunkte|parseFloat">RT Gesamt</th>
<th ts-criteria="interviewbogen">Interviewbogen</th>
<th ts-criteria="laststatus">Status</th>
<th></th>
</tr>
@@ -451,6 +454,7 @@
<td ng-if="!stud.bezeichnung" style="font-weight: bold;">Keine Angabe</td>
<td>{{stud.seqPlace}}</td>
<td>{{stud.rt_gesamtpunkte}}</td>
<td>{{stud.interviewbogen?'vorhanden':'nicht vorhanden'}}</td>
<td>{{stud.laststatus}}</td>
<td>
<input ng-if="stud.applicant" type="checkbox" ng-model="stud.selected"/>