This commit is contained in:
Andreas Österreicher
2007-09-06 10:03:29 +00:00
parent 6efd12038a
commit 71b36b66e5
6 changed files with 39 additions and 10 deletions
+2 -2
View File
@@ -218,12 +218,12 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
label = "&menu-statistic-notenspiegel.label;"
command = "menu-statistic-notenspiegel:command"
accesskey = "&menu-statistic-notenspiegel.accesskey;"/>
<menuitem
<!-- <menuitem
id = "menu-statistic-bewerberstatistik"
key = "menu-statistic-bewerberstatistik:key"
label = "&menu-statistic-bewerberstatistik.label;"
command = "menu-statistic-bewerberstatistik:command"
accesskey = "&menu-statistic-bewerberstatistik.accesskey;"/>
accesskey = "&menu-statistic-bewerberstatistik.accesskey;"/>-->
</menupopup>
</menu>
<menu id="menu-dokumente" label="&menu-dokumente.label;" accesskey="&menu-dokumente.accesskey;">
+10 -1
View File
@@ -42,6 +42,12 @@ loadVariables($conn, $user);
$maxlength= array();
$zeile=1;
$stg_arr_2=array("227"=>"(B)BME","228"=>"(M)BMES","999"=>"(DI)bTec","11"=>"(DI)E","254"=>"(B)E","91"=>"(DI)EW",
"94"=>"(DI)EID","297"=>"(M)ES","1"=>"(M)EUE","329"=>"(M)GRT","300"=>"(M)IE","257"=>"(B)INF",
"182"=>"(DI)SET","327"=>"(B)SET","332"=>"(M)MTUM","298"=>"(M)TKIT","476"=>"(B)EUE","222"=>"(DI)VT",
"301"=>"(M)ITM","334"=>"(M)ITS","333"=>"(B)ITS","308"=>"(DI)IWI","335"=>"(B)IWI","336"=>"(M)IWI",
"330"=>"(B)MR","204"=>"(DI)MR","299"=>"(M)MMSE","92"=>"(DI)PW","328"=>"(M)SET","302"=>"(M)WI",
"145"=>"(DI)ICSS","258"=>"(B)ICSS","331"=>"(M)MR","256"=>"(B)WI","303"=>"(M)IMCS","255"=>"(B)EW");
// Creating a workbook
$workbook = new Spreadsheet_Excel_Writer();
@@ -70,7 +76,10 @@ loadVariables($conn, $user);
$studiengang->getAll('typ, kurzbzlang', false);
foreach ($studiengang->result as $row)
{
$worksheet->write(0,$i,'('.strtoupper($row->typ).') '.$row->kurzbzlang, $format_bold);
if(isset($stg_arr_2[$row->studiengang_kz]))
$worksheet->write(0,$i,$stg_arr_2[$row->studiengang_kz], $format_bold);
else
$worksheet->write(0,$i,'('.strtoupper($row->typ).') '.$row->kurzbzlang, $format_bold);
$maxlength[$i]=strlen('('.strtoupper($row->typ).') '.$row->kurzbzlang);
$stg_spalte[$row->studiengang_kz]=$i;
$i++;
+15 -3
View File
@@ -261,15 +261,27 @@ if($result = pg_query($conn, $qry))
{
echo '<tr><td colspan="2"><b>Betreuungen</b></td></tr>';
echo '<tr>';
echo '<th>&nbsp;</th>';
echo "<th colspan='3'>Titel</th>";
//echo "<th>&nbsp;</th>";
//echo '<th>&nbsp;</th>';
echo "<th align='right'>Stunden</th>";
echo "<th>Student</th>";
echo "<th>Lektor</th>";
echo "<th>Kosten</th>";
echo '<th>&nbsp;</th>';
echo '</tr>';
$gesamtkosten_betreuung=0;
$stunden_betreuung=0;
while($row = pg_fetch_object($result))
{
echo '<tr class="liste1">';
echo '<td>&nbsp;</td>';
echo "<td>$row->titel</td>";
echo "<td>&nbsp;</td>";
echo '<td>&nbsp;</td>';
echo "<td colspan='3'>$row->titel</td>";
//echo "<td>&nbsp;</td>";
//echo '<td>&nbsp;</td>';
echo "<td align='right'>".number_format($row->stunden,2)."</td>";
$benutzer = new benutzer($conn);
$benutzer->load($row->student_uid);
@@ -191,6 +191,7 @@ function StudentProjektarbeitResetFields()
document.getElementById('student-projektarbeit-textbox-anmerkung').value='';
document.getElementById('student-projektarbeit-menulist-firma').value='';
document.getElementById('student-projektarbeit-menulist-note').value='';
document.getElementById('student-projektarbeit-menulist-projekttyp').value='Bachelor';
}
// *****
@@ -426,6 +427,11 @@ function StudentProjektarbeitSpeichern()
return false;
}
if(lehreinheit_id=='')
{
alert('Bitte eine Lehreinheit Auswaehlen');
return false;
}
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
var req = new phpRequest(url,'','');
@@ -723,6 +729,8 @@ function StudentProjektbetreuerDetailDisableFields(val)
document.getElementById('student-projektbetreuer-textbox-stunden').disabled=val;
document.getElementById('student-projektbetreuer-textbox-stundensatz').disabled=val;
document.getElementById('student-projektbetreuer-button-speichern').disabled=val;
document.getElementById('student-projektbetreuer-button-neueperson').disabled=val;
document.getElementById('student-projektbetreuer-button-kontaktdaten').disabled=val;
}
// ****
@@ -423,8 +423,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
</menulist>
</row>
<row>
<button id="student-projektbetreuer-button-neueperson" label="Neue Person anlegen" oncommand="StudentProjektbetreuerNeuePerson()" />
<button id="student-projektbetreuer-button-kontaktdaten" label="Kontakttdaten bearbeiten" oncommand="StudentProjektbetreuerKontaktdaten()" />
<button id="student-projektbetreuer-button-neueperson" label="Neue Person anlegen" oncommand="StudentProjektbetreuerNeuePerson()" disabled="true"/>
<button id="student-projektbetreuer-button-kontaktdaten" label="Kontakttdaten bearbeiten" oncommand="StudentProjektbetreuerKontaktdaten()" disabled="true"/>
</row>
<row>
<label value="Art" control="student-projektbetreuer-menulist-betreuerart"/>
+2 -2
View File
@@ -178,11 +178,11 @@ class projektarbeit
$this->errormsg = 'Anmerkung darf nicht länger als 256 Zeichen sein - student_uid: '.$this->student_uid;
return false;
}
if(!is_numeric($this->note))
/*if(!is_numeric($this->note))
{
$this->errormsg = 'Note muß ein numerischer Wert sein - student_uid: '.$this->student_uid;
return false;
}
}*/
if(!is_numeric($this->punkte))
{
$this->errormsg = 'Punkte muß ein numerischer Wert sein - student_uid: '.$this->student_uid;