diff --git a/cis/private/outgoing/outgoing.php b/cis/private/outgoing/outgoing.php index f6e01538e..c4f428108 100755 --- a/cis/private/outgoing/outgoing.php +++ b/cis/private/outgoing/outgoing.php @@ -335,7 +335,7 @@ if(isset($_GET['ansicht']) == 'auswahl') ?> - + @@ -470,27 +470,28 @@ if(isset($_GET['ansicht']) == 'auswahl') } ?> + + + +

t('incoming/outgoingRegistration'); ?>
t('profil/student').': '.$name; ?>

t('incoming/outgoingRegistration'); ?>
uid)!='0')?"Mitarbeiter: ":"Student: ").$name; ?>

t('incoming/programmAuswahl');?>:

t('incoming/neuenOutgoingAnlegen'); ?>
 
checkStatus($outgoing->preoutgoing_id, 'freigabe')) + echo ''.$p->t('incoming/warteAufFreigabe').''; + + ?> +
- - checkStatus($outgoing->preoutgoing_id, 'freigabe')) - echo ''.$p->t('incoming/warteAufFreigabe').''; - - ?> - - + -

t('incoming/summerschool');?>:

- +
CEEPUSSummerschool
- + @@ -554,7 +555,7 @@ else '; - echo ''; + echo ''; echo ''; } @@ -563,37 +564,46 @@ else echo '

t('incoming/outgoingRegistration'); ?>

t('incoming/outgoingRegistration'); ?>
uid)!='0')?"Mitarbeiter: ":"Student: ").$name; ?>

t('incoming/zusaetzlicheDaten');?>:

'.$p->t('incoming/sprachkursVon').': '.$p->t('incoming/StudienrichtungGastuniversitaet').':
'.$p->t('incoming/sprachkursVon').': '.$p->t('incoming/studienrichtungGastuniversitaet').':
'.$p->t('incoming/sprachkursBis').':
'; echo '
'; echo ''; - echo ''; + echo ''; echo '
'; echo ''; - echo '
'; - echo '

'.$p->t('incoming/auswahlDerLv').'

'; - echo '
'; - echo ''; - echo ''; - echo '
'.$p->t('global/bezeichnung').': Wochenstunden: ECTS: Unit Code:
'; - echo '
'; - - $preoutgoingLv = new preoutgoing(); - $preoutgoingLv->loadLvs($outgoing_id); - echo '

'.$p->t('incoming/uebersichtLv').'

'; - echo' - - - - - - - - - - '; - foreach($preoutgoingLv->lehrveranstaltungen as $lv) + + // Bei Mitarbeiter Lehrveranstaltung ausblenden + if(check_lektor($outgoing->uid)=='0') { - echo ''; + echo '
'; + echo '

'.$p->t('incoming/auswahlDerLv').'

'; + echo ''; + echo '
'.$p->t('global/bezeichnung').''.$p->t('incoming/wochenstunden').''.$p->t('incoming/ects').''.$p->t('incoming/unitcode').'
'.$lv->bezeichnung.''.$lv->ects.''.$lv->wochenstunden.''.$lv->unitcode.''.$p->t('incoming/loeschen').'
'; + echo ''; + echo '
'.$p->t('global/bezeichnung').': Wochenstunden: ECTS: Unit Code:
'; + echo ''; + $preoutgoingLv = new preoutgoing(); + $preoutgoingLv->loadLvs($outgoing_id); + echo '

'.$p->t('incoming/uebersichtLv').'

'; + echo' + + + + + + + + + + '; + foreach($preoutgoingLv->lehrveranstaltungen as $lv) + { + echo ''; + + } + echo '
'.$p->t('global/bezeichnung').''.$p->t('incoming/wochenstunden').''.$p->t('incoming/ects').''.$p->t('incoming/unitcode').'
'.$lv->bezeichnung.''.$lv->ects.''.$lv->wochenstunden.''.$lv->unitcode.''.$p->t('incoming/loeschen').'
'; + echo ''; + echo ''; + echo '
'; } - echo '
'; + echo '
'; echo '

'.$p->t('incoming/verwaltungVonDateien').'

'; echo ' @@ -656,8 +666,12 @@ else } function getLearningAgreement() { - var url = "content/pdfExport.php?xsl=OutgoingLearning&xml=learningagreement_outgoing.rdf.php&preoutgoing_id=33&output=pdf"; - alert(url); + var url = "content/pdfExport.php?xsl=OutgoingLearning&xml=learningagreement_outgoing.rdf.php&preoutgoing_id=preoutgoing_id;?>&output=pdf"; + window.location.href= url; + } + function getLearningAgreementChange() + { + var url = "content/pdfExport.php?xsl=OutgoingChangeL&xml=learningagreement_outgoing.rdf.php&preoutgoing_id=preoutgoing_id;?>&output=pdf"; window.location.href= url; } function test() diff --git a/cis/private/outgoing/registration.php b/cis/private/outgoing/registration.php index f47b44700..5378858ea 100755 --- a/cis/private/outgoing/registration.php +++ b/cis/private/outgoing/registration.php @@ -51,7 +51,7 @@ if($outgoing->loadUid($uid))
- +