mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
This commit is contained in:
@@ -137,7 +137,8 @@
|
||||
$fasnoten_arr[$row->lehrveranstaltung_fk][$row->note_pk]["notenlektor_fk"] = $row->notenlektor_fk;
|
||||
$fasnoten_arr[$row->lehrveranstaltung_fk][$row->note_pk]["student_fk"] = $row->student_fk;
|
||||
$fasnoten_arr[$row->lehrveranstaltung_fk][$row->note_pk]["ext_id"] = $row->note_pk;
|
||||
$fasnoten_arr[$row->lehrveranstaltung_fk][$mehrfach_arr[$row->lehrveranstaltung_fk]["main"]]["bemerkung"] .= "\n".$bemerkung_history;
|
||||
if ($bemerkung_history != "")
|
||||
$fasnoten_arr[$row->lehrveranstaltung_fk][$mehrfach_arr[$row->lehrveranstaltung_fk]["main"]]["bemerkung"] .= "\n".$bemerkung_history;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -218,7 +219,7 @@
|
||||
|
||||
$text .= "<table border='1'>";
|
||||
|
||||
$sqlstr = "SELECT DISTINCT student_fk FROM note where student_fk > 3000 and student_fk < 4000 order by student_fk";
|
||||
$sqlstr = "SELECT DISTINCT student_fk FROM note where student_fk >= 1 and student_fk < 500 order by student_fk";
|
||||
if($result = pg_query($conn_fas, $sqlstr))
|
||||
{
|
||||
|
||||
@@ -262,107 +263,125 @@
|
||||
foreach($lehreinheit_id_arr as $lehreinh)
|
||||
{
|
||||
if (key_exists($lehreinh,$lehreinheiten_sync_arr))
|
||||
{
|
||||
$lehreinheit_id = $lehreinheiten_sync_arr[$lehreinh];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
$lehreinheit_id = "FEHLT";
|
||||
|
||||
|
||||
//begin insert tbl_pruefung
|
||||
$anz_processed_pruef++;
|
||||
$pruef = new pruefung($conn);
|
||||
|
||||
$pruef->lehreinheit_id=$lehreinheit_id;
|
||||
$pruef->student_uid=$student_uid;
|
||||
$pruef->mitarbeiter_uid=$mitarbeiter_uid;
|
||||
$pruef->note=$note;
|
||||
$pruef->pruefungstyp_kurzbz=$pruefungstyp_kurzbz;
|
||||
$pruef->datum=$datum;
|
||||
$pruef->anmerkung=$anmerkung;
|
||||
$pruef->insertamum=$insertamum;
|
||||
$pruef->insertvon=$insertvon;
|
||||
$pruef->updateamum=$insertamum;
|
||||
$pruef->updatevon=$updatevon;
|
||||
$pruef->ext_id=$ext_id;
|
||||
|
||||
if (!($pruef->pruefung_id=checkUpdatePruefung($conn,$pruef)))
|
||||
$pruef->new = 1;
|
||||
|
||||
|
||||
if($pruef->pruefung_id == -1)
|
||||
$anz_not_updated_pruef++;
|
||||
else if($pruef->student_uid == "FEHLT")
|
||||
if($student_uid == "FEHLT")
|
||||
{
|
||||
$insert_error_pruef++;
|
||||
$text .= "Prüfung: Datensatz FAS ID".$idkey.": student_uid ohne zuordnung<br>";
|
||||
}
|
||||
else if($pruef->lehreinheit_id == "FEHLT")
|
||||
else if($lehreinheit_id == "FEHLT")
|
||||
{
|
||||
$insert_error_pruef++;
|
||||
$text .= "Prüfung: Datensatz FAS ID".$idkey.": Lehreinheit ohne zuordnung<br>";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!$pruef->save())
|
||||
{
|
||||
$text .= "Prüfung: Datensatz FAS ID".$idkey.": ".$pruef->errormsg."<br>";
|
||||
if($pruef->new)
|
||||
$insert_error_pruef++;
|
||||
else
|
||||
$update_error_pruef++;
|
||||
}
|
||||
else
|
||||
if($pruef->new)
|
||||
$anz_insert_pruef++;
|
||||
else
|
||||
$anz_update_pruef++;
|
||||
}
|
||||
|
||||
if ($zeugnistabeintrag == 1)
|
||||
{
|
||||
|
||||
$anz_processed_zeug++;
|
||||
$pruef = new pruefung($conn);
|
||||
|
||||
$pruef->lehreinheit_id=$lehreinheit_id;
|
||||
$pruef->student_uid=$student_uid;
|
||||
$pruef->mitarbeiter_uid=$mitarbeiter_uid;
|
||||
$pruef->note=$note;
|
||||
$pruef->pruefungstyp_kurzbz=$pruefungstyp_kurzbz;
|
||||
$pruef->datum=$datum;
|
||||
$pruef->anmerkung=$anmerkung;
|
||||
$pruef->insertamum=$insertamum;
|
||||
$pruef->insertvon=$insertvon;
|
||||
$pruef->updateamum=date("Y-m-d H:m:s");
|
||||
$pruef->updatevon=$updatevon;
|
||||
$pruef->ext_id=$ext_id;
|
||||
|
||||
$zeug = new zeugnisnote($conn);
|
||||
$zeug->lehrveranstaltung_id = $lehrveranstaltung_id;
|
||||
$zeug->student_uid = $student_uid;
|
||||
$zeug->studiensemester_kurzbz = $studiensemester_kurzbz;
|
||||
$zeug->note = $note;
|
||||
$zeug->uebernahmedatum = null;
|
||||
$zeug->benotungsdatum = $datum;
|
||||
$zeug->updateamum = $insertamum;
|
||||
$zeug->updatevon = $updatevon;
|
||||
$zeug->insertamum = $insertamum;
|
||||
$zeug->insertvon = $insertvon;
|
||||
$zeug->ext_id = $ext_id;
|
||||
$zeug->bemerkung = $anmerkung;
|
||||
if (!($pruef->pruefung_id=checkUpdatePruefung($conn,$pruef)))
|
||||
$pruef->new = 1;
|
||||
|
||||
|
||||
if (!($zeug->check = checkUpdateZeugnis($conn,$zeug)))
|
||||
$zeug->new = 1;
|
||||
|
||||
if($zeug->check == -1)
|
||||
$anz_not_updated_zeug++;
|
||||
else if($zeug->student_uid == "FEHLT")
|
||||
{
|
||||
$insert_error_zeug++;
|
||||
$text .= "<span style='background-color:#cccccc;'>Zeugnis: Datensatz FAS ID".$idkey.": student_uid ohne zuordnung</span><br>";
|
||||
}
|
||||
if($pruef->pruefung_id == -1)
|
||||
$anz_not_updated_pruef++;
|
||||
|
||||
else
|
||||
{
|
||||
if(!$zeug->save())
|
||||
if(!$pruef->save())
|
||||
{
|
||||
$text .= "<span style='background-color:#cccccc;'>Zeugnis: Datensatz FAS ID".$idkey.": ".$zeug->errormsg."</span><br>";
|
||||
if($zeug->new)
|
||||
$insert_error_zeug++;
|
||||
$text .= "Prüfung: Datensatz FAS ID".$idkey.": ".$pruef->errormsg."<br>";
|
||||
if($pruef->new)
|
||||
$insert_error_pruef++;
|
||||
else
|
||||
$update_error_zeug++;
|
||||
$update_error_pruef++;
|
||||
}
|
||||
else
|
||||
if($zeug->new)
|
||||
$anz_insert_zeug++;
|
||||
if($pruef->new)
|
||||
$anz_insert_pruef++;
|
||||
else
|
||||
$anz_update_zeug++;
|
||||
$anz_update_pruef++;
|
||||
}
|
||||
}
|
||||
|
||||
//begin insert tbl_zeugnisnote
|
||||
if ($zeugnistabeintrag == 1)
|
||||
{
|
||||
$anz_processed_zeug++;
|
||||
|
||||
if($student_uid == "FEHLT")
|
||||
{
|
||||
$insert_error_zeug++;
|
||||
$text .= "<span style='background-color:#cccccc;'>Zeugnis: Datensatz FAS ID".$idkey.": student_uid ohne zuordnung</span><br>";
|
||||
}
|
||||
else if ($lehrveranstaltung_id == "FEHLT")
|
||||
{
|
||||
$insert_error_zeug++;
|
||||
$text .= "<span style='background-color:#cccccc;'>Zeugnis: Datensatz FAS ID".$idkey.": lehrveranstaltung_id ohne zuordnung</span><br>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$zeug = new zeugnisnote($conn);
|
||||
|
||||
$zeug->lehrveranstaltung_id = $lehrveranstaltung_id;
|
||||
$zeug->student_uid = $student_uid;
|
||||
$zeug->studiensemester_kurzbz = $studiensemester_kurzbz;
|
||||
$zeug->note = $note;
|
||||
$zeug->uebernahmedatum = null;
|
||||
$zeug->benotungsdatum = $datum;
|
||||
$zeug->updateamum = date("Y-m-d H:m:s");
|
||||
$zeug->updatevon = $updatevon;
|
||||
$zeug->insertamum = $insertamum;
|
||||
$zeug->insertvon = $insertvon;
|
||||
$zeug->ext_id = $ext_id;
|
||||
$zeug->bemerkung = $anmerkung;
|
||||
|
||||
if (!($zeug->check = checkUpdateZeugnis($conn,$zeug)))
|
||||
$zeug->new = 1;
|
||||
|
||||
if($zeug->check == -1)
|
||||
$anz_not_updated_zeug++;
|
||||
|
||||
else
|
||||
{
|
||||
if(!$zeug->save())
|
||||
{
|
||||
$text .= "<span style='background-color:#cccccc;'>Zeugnis: Datensatz FAS ID".$idkey.": ".$zeug->errormsg."</span><br>";
|
||||
if($zeug->new)
|
||||
$insert_error_zeug++;
|
||||
else
|
||||
$update_error_zeug++;
|
||||
}
|
||||
else
|
||||
if($zeug->new)
|
||||
$anz_insert_zeug++;
|
||||
else
|
||||
$anz_update_zeug++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 71 B |
Binary file not shown.
|
After Width: | Height: | Size: 71 B |
Binary file not shown.
|
After Width: | Height: | Size: 63 B |
@@ -0,0 +1,93 @@
|
||||
table.example {
|
||||
border:1px solid black;
|
||||
border-collapse:collapse;
|
||||
}
|
||||
table.example th, table.example td {
|
||||
border:1px solid #aaaaaa;
|
||||
padding: 2px 15px 2px 15px;
|
||||
}
|
||||
table.example thead th {
|
||||
background-color:#ccccff;
|
||||
}
|
||||
table.example tfoot td {
|
||||
background-color:#ffccff;
|
||||
}
|
||||
|
||||
table.example tr.tbody_header {
|
||||
font-weight:bold;
|
||||
text-align:center;
|
||||
background-color:#dddddd;
|
||||
}
|
||||
|
||||
table.example a.pagelink {
|
||||
padding-left:5px;
|
||||
padding-right:5px;
|
||||
border:1px solid #666666;
|
||||
margin:0px 5px 0px 5px;
|
||||
}
|
||||
table.example a.currentpage {
|
||||
background-color:yellow;
|
||||
}
|
||||
/* Striping */
|
||||
tr.alternate {
|
||||
background-color:#E6E6CC;
|
||||
}
|
||||
|
||||
/* Sorting */
|
||||
th.table-sortable {
|
||||
cursor:pointer;
|
||||
background-image:url("icons/01_unsorted.gif");
|
||||
background-position:center left;
|
||||
background-repeat:no-repeat;
|
||||
padding-left:12px;
|
||||
}
|
||||
th.table-sorted-asc {
|
||||
background-image:url("icons/01_ascending.gif");
|
||||
background-position:center left;
|
||||
background-repeat:no-repeat;
|
||||
}
|
||||
th.table-sorted-desc {
|
||||
background-image:url("icons/01_descending.gif");
|
||||
background-position:center left;
|
||||
background-repeat:no-repeat;
|
||||
}
|
||||
th.table-filtered {
|
||||
background-image:url("filter.gif");
|
||||
background-position:center left;
|
||||
background-repeat:no-repeat;
|
||||
}
|
||||
select.table-autofilter {
|
||||
font-size:smaller;
|
||||
}
|
||||
|
||||
/* Examples which stray from the default */
|
||||
table.altstripe tr.alternate2 {
|
||||
background-color:#ccffff;
|
||||
}
|
||||
|
||||
/* Sort Icon Styles */
|
||||
table.sort01 th.table-sortable { background-image:url("icons/01_unsorted.gif"); }
|
||||
table.sort01 th.table-sorted-asc { background-image:url("icons/01_ascending.gif"); }
|
||||
table.sort01 th.table-sorted-desc { background-image:url("icons/01_descending.gif"); }
|
||||
|
||||
|
||||
|
||||
/* Icons box */
|
||||
.iconset {
|
||||
margin:5px;
|
||||
border:1px solid #cccccc;
|
||||
border-color:#cccccc #666666 #666666 #cccccc;
|
||||
text-align:center;
|
||||
cursor:pointer;
|
||||
width:100px;
|
||||
}
|
||||
.iconset img {
|
||||
margin:3px;
|
||||
}
|
||||
|
||||
/* Documentation */
|
||||
tr.doc_section {
|
||||
font-weight:bold;
|
||||
text-align:center;
|
||||
background-color:#dddddd;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -157,7 +157,7 @@
|
||||
$htmlstr .= " <table>\n";
|
||||
$htmlstr .= " <tr>\n";
|
||||
$htmlstr .= " <td>Kennzahl</td>\n";
|
||||
$htmlstr .= " <td><input class='detail' type='text' name='studiengang_kz' size='16' maxlength='4' value='".$studiengang_kz."' onchange='submitable()'></td>\n";
|
||||
$htmlstr .= " <td><input class='detail' type='text' name='studiengang_kz' size='16' maxlength='5' value='".$studiengang_kz."' onchange='submitable()'></td>\n";
|
||||
$htmlstr .= " </tr>\n";
|
||||
$htmlstr .= " <tr>\n";
|
||||
$htmlstr .= " <td>Kurzbezeichnung</td>\n";
|
||||
|
||||
@@ -18,14 +18,16 @@
|
||||
if (!$sg->getAll('kurzbzlang',false))
|
||||
die($sg->errormsg);
|
||||
|
||||
$htmlstr = "<table class='liste sortable'>\n";
|
||||
$htmlstr .= " <tr class='liste'>\n";
|
||||
$htmlstr .= " <th>Kz</th><th>Kurzbez</th><th>KurzLang</th> <th>Typ</th><th>Bezeichnung</th><th class='sorttable_nosort'>Aktiv</th><th>Telefon</th><th>Email</th>";
|
||||
$htmlstr .= " </tr>";
|
||||
//$htmlstr = "<table class='liste sortable'>\n";
|
||||
$htmlstr = "<form name='formular'><input type='hidden' name='check' value=''></form><table id='t1' class='liste table-autosort:2 table-stripeclass:alternate table-autostripe'>\n";
|
||||
$htmlstr .= " <thead><tr class='liste'>\n";
|
||||
$htmlstr .= " <th class='table-sortable:numeric' onmouseup='document.formular.check.value=0'>Kz</th><th class='table-sortable:default'>Kurzbez</th><th class='table-sortable:default'>KurzLang</th> <th class='table-sortable:default'>Typ</th><th class='table-sortable:alphanumeric'>Bezeichnung</th><th>Aktiv</th><th class='table-sortable:default'>Telefon</th><th class='table-sortable:default'>Email</th>";
|
||||
$htmlstr .= " </tr></thead><tbody>\n";
|
||||
$i = 0;
|
||||
foreach ($sg->result as $stg)
|
||||
{
|
||||
$htmlstr .= " <tr class='liste". ($i%2) ."'>\n";
|
||||
//$htmlstr .= " <tr class='liste". ($i%2) ."'>\n";
|
||||
$htmlstr .= " <tr>\n";
|
||||
$htmlstr .= " <td>".$stg->studiengang_kz."</td>\n";
|
||||
$htmlstr .= " <td>".$stg->kurzbz."</td>\n";
|
||||
$htmlstr .= " <td>".$stg->kurzbzlang."</td>\n";
|
||||
@@ -45,7 +47,7 @@
|
||||
$htmlstr .= " </tr>\n";
|
||||
$i++;
|
||||
}
|
||||
$htmlstr .= "</table>\n";
|
||||
$htmlstr .= "</tbody></table>\n";
|
||||
|
||||
|
||||
?>
|
||||
@@ -54,7 +56,8 @@
|
||||
<title>Studiengänge Uebersicht</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
|
||||
<script src="../../include/js/sorttable.js"></script>
|
||||
<link rel="stylesheet" href="../../include/js/tablesort/table.css" type="text/css">
|
||||
<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
|
||||
<script language="JavaScript">
|
||||
function confdel()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user