Menu
▾
▴
[Cobricks-cvscommit] drehscheibe-in/web/course c.html.de ccreate.html.de clcreate.html.de clsearch.html.de clupdate.html.de cm.html.de cm.html.en cmcreate.html.de cmdelete.html.de cmupdate.html.de cpcreate.html.de cpsearch.html.de crsearch.html.de csearch.html.de cupdate.html.de index.html.de navigation.html.de timetable.html.de timetablem.html.de timetablew.html.de
|
From: Michael K. <ko...@us...> - 2006-10-18 16:51:15
|
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24428 Modified Files: c.html.de ccreate.html.de clcreate.html.de clsearch.html.de clupdate.html.de cm.html.de cm.html.en cmcreate.html.de cmdelete.html.de cmupdate.html.de cpcreate.html.de cpsearch.html.de crsearch.html.de csearch.html.de cupdate.html.de index.html.de navigation.html.de timetable.html.de timetablem.html.de timetablew.html.de Log Message: Index: cmdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmdelete.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cmdelete.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ cmdelete.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -46,7 +46,7 @@ </tr> #foreach ( $c in $courseSR ) <tr> - <td><a href="c.html?cid=$c.getId()">$!c.getName()</a></td> + <td><a href="c.html?cid=$c.getId()">$!c.getFullName()</a></td> <td>$!c.getTerm()</td> </tr> #end Index: cmupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmupdate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cmupdate.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ cmupdate.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -302,7 +302,7 @@ </td> <td> #if ("$!acc"=="module") -$portalPresenter.printSelect("type$j","--,pf,wp,wa,ko,vt,er,gr,ke"," ,pf,wp,wa,ko,vt,er,gr,ke",$cmpr.getType()) +$portalPresenter.printSelect("type$j","--,Pflichtfach,Wahlpflichtfach,Wahlfach,Vertiefung,Ergänzungsfach,Graduiertenstudium,Kernfach"," ,pf,wp,wa,vt,er,gr,ke",$cmpr.getType()) #else $cmpr.getType() #end @@ -345,12 +345,7 @@ </select> </td> <td> - <select name="type$i"> - <option value="">--</option> - #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) - <option value="$i">$i</option> - #end - </select> +$portalPresenter.printSelect("type$i","--,Pflichtfach,Wahlpflichtfach,Wahlfach,Vertiefung,Ergänzungsfach,Graduiertenstudium,Kernfach"," ,pf,wp,wa,vt,er,gr,ke","") </td> <td> <select name="startsem$i"> Index: csearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/csearch.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- csearch.html.de 6 Oct 2006 12:36:32 -0000 1.3 +++ csearch.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -11,11 +11,11 @@ #set ( $acc = $userPresenter.checkPermission("$auserid", "course", "create", "") ) #end -#set ($tmps = "$!cname$!cname_en$!cmtype$!cterm$!clang$!cmid$!lecturername$!crid$!cmhidden$!weekday$!startdate$!enddate$!cycle$!cpid$!coursetype$!starthour$!endhour$!endmin$!startmin") +#set ($tmps = "$!cname$!cmtype$!cterm$!clang$!cmid$!lecturername$!crid$!cmhidden$!weekday$!startdate$!enddate$!cycle$!cpid$!coursetype$!starthour$!endhour$!endmin$!startmin") #if ("$!tmps" == "") #set ($query = "cid=0") #else -#set ($query = "cname=$!{cname}&cname_en=$!{cname_en}&cmtype=$!{cmtype}&cterm=$!{cterm}&clang=$!{clang}&cmid=$!{cmid}&") +#set ($query = "cname=$!{cname}&cmtype=$!{cmtype}&cterm=$!{cterm}&clang=$!{clang}&cmid=$!{cmid}&") #set ($query = "${query}lecturername=$!{lecturername}&crid=$!{crid}&cmhidden=$!{cmhidden}&weekday=$!{weekday}&") #set ($query = "${query}startdate=$!{startdate}&enddate=$!{enddate}&cycle=$!{cycle}&") #set ($query = "${query}cpid=$!{cpid}&coursetype=$!{coursetype}&") @@ -38,7 +38,7 @@ <table id="result" width="90%" align="center"> #foreach ( $c in $results ) <tr> -<td><a href="c.html?cid=$c.getId()">$!c.getName()</a></td> +<td><a href="c.html?cid=$c.getId()">$!c.getFullName()</a></td> <td>$!c.getTerm()</td> <td> #set( $courseModule = $c.getCourseModule()) @@ -61,16 +61,12 @@ <p> <table border="0"> -<form action="csearch.html" method="post"> +<form action="csearch.html" method="get"> <tr> <td>Name</td> <td><input name="cname" size="50" value="$!cname"></td> </tr> <tr> - <td>Name (englisch)</td> - <td><input name="cname_en" size="50" value="$!cname_en"></td> -</tr> -<tr> <td>Typ</td> <td> $portalPresenter.printSelect("cmtype","alle,Vorlesung,Praktikum,Seminar"," ,Vorlesung,Praktikum,Seminar","$!cmtype") @@ -81,7 +77,7 @@ <td> <select name="cterm" size="1"> <option value="" >alle</option> -$!coursePresenter.getTerms("notemptystring") +$!coursePresenter.getTerms("") </select> </td> </tr> @@ -111,8 +107,9 @@ #end <tr> <td>Dozent</td> - <td><input name="lecturername" size="50" value="$!lecturername"></td> + <td><input name="lecturername" size="25" value="$!lecturername"></td> </tr> +<!-- <tr> <td>Raum</td> <td> @@ -128,6 +125,7 @@ </select> </td> </tr> +--> <tr> <td>Wochentag</td> <td> @@ -137,10 +135,10 @@ <tr> <td>Zeit</td> <td> - begin + von <input name="starthour" value="$!starthour" size="2" maxlength="2"> <!--input name="startmin" value="$!startmin" size="2" maxlength="2"--> - end + bis <input name="endhour" value="$!endhour" size="2" maxlength="2"> <!--input name="endmin" value="$!endmin" size="2" maxlength="2"--> </td> @@ -150,7 +148,7 @@ <td> von <input name="startdate" value="$!startdate" maxlength="10" size="10"> bis <input name="enddate" value="$!enddate" maxlength="10" size="10"> - <i>(2000-12-31)</i> + <i>(2000-12-31, 31.12.2000)</i> </td> </tr> <tr> @@ -172,22 +170,13 @@ <tr> <td>Einordnung in Studiengang</td> <td> - <select name="coursetype"> - <option value="">alle</option> - #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) - #set ($sel = "") - #if ( "$!i" == "$!coursetype" ) - #set ($sel = 'selected="1"') - #end - <option value="$i" $!sel>$i </option> - #end - </select> +$portalPresenter.printSelect("coursetype","alle,Pflichtfach,Wahlpflichtfach,Wahlfach,Vertiefung,Ergänzungsfach,Graduiertenstudium,Kernfach"," ,pf,wp,wa,vt,er,gr,ke","$!coursetype") </td> </tr> <tr> <td>Sortierung nach</td> <td> -$portalPresenter.printSelect("sortby","Name,Typ,Studiengang","cname,cmtype,cpid","$!sortby") +$portalPresenter.printSelect("sortby","Name,Typ,Dozent,Studiengang","cname,cmtype,llastname,cpid","$!sortby") </td> </tr> <tr> @@ -196,4 +185,4 @@ </form> </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) Index: c.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/c.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- c.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ c.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -1,154 +1,222 @@ - -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) - -#set ($cid = $!cid) -#set( $course = $coursePresenter.getCourse($cid) ) -#set( $cm = $course.getCourseModule() ) - -<h1>$!course.getName()</h1> - -<table border="0"> -<tr> - <td>Modul</td> - <td> - <a href="cm.html?id=$cm.getSId()">$cm.getName()</a> - </td> -</tr> -<tr> - <td>Typ</td> - <td> - $cm.getType() - </td> -</tr> -<tr> - <td>Semester</td> - <td> - $!coursePresenter.getTermName("$course.getTerm()") - </td> -</tr> -<tr> - <td>Kommentar</td> - <td>$!course.getComment()</td> -</tr> -<tr> - <td>Sprache</td> - <td> - #set ($seloption = "$course.getLang()") - #if ( $seloption == "de") - Deutsch - #elseif ( $seloption == "en" ) - Englisch - #end - </td> -</tr> -<tr> - <td>URL</td> - <td><a href="$!course.getUrl()">$!course.getUrl()</a></td> -</tr> -<tr> - <td>Teilnehmerzahl</td> - <td>$!course.getCapacity()</td> -</tr> -<tr> - <td>ECTS Credits</td> - <td>$!course.getEctsCredits()</td> -</tr> -<tr> - <td>Semesterwochenstunden</td> - <td>$coursePresenter.printSWS($course)</td> -</tr> -<tr><td>Prüfer</td><td> -$courseManager.getLecturer($course.getExaminerId()).getName() -</td></tr> -<tr> - <td valign="top">Inhalt</td> - <td>$!course.getContent()</td> -</tr> -<tr> - <td valign="top">Lernziele</td> - <td>$!course.getTarget()</td> -</tr> -<tr> - <td valign="top">Voraussetzungen</td> - <td>$!course.getPrerequ()</td> -</tr> -<tr> - <td valign="top">Prüfungsdetails</td> - <td>$!course.getCert()</td> -</tr> -<tr> - <td valign="top">Didaktik</td> - <td>$!course.getDidactics()</td> -</tr> -</table> -<h3>Dozent(en)</h3> -<table border="0"> - #foreach ( $c in $coursePresenter.getLecturersForCourse($cid) ) - <tr> - <td>$!c.getFirstName() $!c.getLastName()</td> - </tr> - #end -</table> -<h3>Termine</h3> -<table border="1"> -#set ( $courseDates = $coursePresenter.getCourseDates($cid) ) -#foreach ( $cDate in $courseDates ) -<tr> - <td> - #set ($seloption = "$cDate.getWeekday()") - #if ( $seloption == $coursePresenter.MONDAY ) - Mo - #elseif ( $seloption == $coursePresenter.TUESDAY ) - Di - #elseif ( $seloption == $coursePresenter.WEDNESDAY ) - Mi - #elseif ( $seloption == $coursePresenter.THURSDAY ) - Do - #elseif ( $seloption == $coursePresenter.FRIDAY ) - Fr - #elseif ( $seloption == $coursePresenter.SATURDAY ) - Sa - #elseif ( $seloption == $coursePresenter.SUNDAY ) - So - #end - </td> - <td>$!cDate.getStartHour()</td><td>:</td> - <td>$!cDate.getStartMin()</td><td>-</td> - <td>$!cDate.getEndHour()</td><td>:</td> - <td>$!cDate.getEndMin()</td> - <td> - #foreach ( $cr in $coursePresenter.searchCourseRooms("") ) - #set ($sel = "") - #if ($cr.getId() == $cDate.getRoomId()) - $!cr.getName() - #end - #end - </td> - <td>$!cDate.getStartDate()</td> - <td>$!cDate.getEndDate()</td> - <td> - #set ($seloption = "$cDate.getCycle()") - #if ( $seloption == "0" ) - dayly/once - #elseif ( $seloption == "1" ) - weekly - #elseif ( $seloption == "2" ) - biweekly - #end - </td> - <td> - #set ($seloption = "$cDate.getType()") - #if ( $seloption == "0" ) - standart - #elseif ( $seloption == "1" ) - exercise - #elseif ( $seloption == "2" ) - central exercise - #end - </td> -</tr> -#end -</table> -<p> - -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) + +$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) + +#set ($cid = $!cid) +#set( $course = $coursePresenter.getCourse($cid) ) +#set( $cm = $course.getCourseModule() ) + +<h1>$!course.getFullName()</h1> + +<table border="0"> +<tr> + <td>Modul</td> + <td> + <a href="cm.html?id=$cm.getSId()">$cm.getName()</a> + </td> +</tr> +<tr> + <td>Typ</td> + <td> + $cm.getType() + </td> +</tr> +<tr> + <td>Semester</td> + <td> + $!coursePresenter.getTermName("$course.getTerm()") + </td> +</tr> +#set ($tmps = "") +#set ($tmps = $!course.getComment()) +#if ("$!tmps"!="") +<tr> + <td>Kommentar</td> + <td>$tmps</td> +</tr> +#end +<tr> + <td>Sprache</td> + <td> + #set ($seloption = "$course.getLang()") + #if ( $seloption == "en") + Englisch + #else + Deutsch + #end + </td> +</tr> +#set ($tmps = "") +#set ($tmps = $!course.getUrl()) +#if ("$!tmps"!="") +<tr> + <td>URL</td> + <td><a href="$!course.getUrl()">$!course.getUrl()</a></td> +</tr> +#end +<tr> + <td>Teilnehmerzahl</td> + <td>$!course.getCapacity()</td> +</tr> +<tr> + <td>ECTS Credits</td> + <td>$!course.getEctsCredits()</td> +</tr> +<tr> + <td>Semesterwochenstunden</td> + <td>$coursePresenter.printSWS($course)</td> +</tr> +#set ($tmpid = $course.getExaminerId()) +#if ("$!tmpid"!="") +#if ("$!tmpid"!="0") +<tr><td>Prüfer</td><td> +$courseManager.getLecturer($tmpid).getName() +</td></tr> +#end +#end +#set ($tmps = "") +#set ($tmps = $!course.getContent()) +#if ("$!tmps"=="") +#set ($tmps = $!cm.getContent()) +#end +#if ("$!tmps"!="") +<tr> + <td valign="top">Inhalt</td> + <td>$tmps</td> +</tr> +#end +#set ($tmps = "") +#set ($tmps = $!course.getTarget()) +#if ("$!tmps"=="") +#set ($tmps = $!cm.getTarget()) +#end +#if ("$!tmps"!="") +<tr> + <td valign="top">Lernziele</td> + <td>$tmps</td> +</tr> +#end +#set ($tmps = "") +#set ($tmps = $!course.getPrerequ()) +#if ("$!tmps"=="") +#set ($tmps = $!cm.getPrerequ()) +#end +#if ("$!tmps"!="") +<tr> + <td valign="top">Voraussetzungen</td> + <td>$coursePresenter.printPrerequ("$tmps")</td> +</tr> +#end +#set ($tmps = "") +#set ($tmps = $!course.getCert()) +#if ("$!tmps"=="") +#set ($tmps = $!cm.getCert()) +#end +#if ("$!tmps"!="") +<tr> + <td valign="top">Prüfungsdetails</td> + <td>$coursePresenter.printCert($tmps)</td> +</tr> +#end +#set ($tmps = "") +#set ($tmps = $!course.getDidactics()) +#if ("$!tmps"=="") +#set ($tmps = $!cm.getDidactics()) +#end +#if ("$!tmps"!="") +<tr> + <td valign="top">Didaktik</td> + <td>$tmps</td> +</tr> +#end +</table> +<h3>Dozent(en)</h3> +<table border="0"> + #foreach ( $c in $coursePresenter.getLecturersForCourse($cid) ) +#set ($curl = $c.getUrl()) +#if ("$!curl"!="") + <tr> + <td><a href="$curl">$!c.getFirstName() $!c.getLastName()</a></td> + </tr> +#else + <tr> + <td>$!c.getFirstName() $!c.getLastName()</td> + </tr> +#end + #end +</table> +<h3>Termine</h3> +<table border="0"> +#set ( $courseDates = $coursePresenter.getCourseDates($cid) ) +#foreach ( $cDate in $courseDates ) +<tr> + <td> + #set ($seloption = "$cDate.getWeekday()") + #if ( $seloption == $coursePresenter.MONDAY ) + Mo + #elseif ( $seloption == $coursePresenter.TUESDAY ) + Di + #elseif ( $seloption == $coursePresenter.WEDNESDAY ) + Mi + #elseif ( $seloption == $coursePresenter.THURSDAY ) + Do + #elseif ( $seloption == $coursePresenter.FRIDAY ) + Fr + #elseif ( $seloption == $coursePresenter.SATURDAY ) + Sa + #elseif ( $seloption == $coursePresenter.SUNDAY ) + So + #end + </td> + <td>$!cDate.getStartHour():$!cDate.getStartMin()</td><td>-</td> + <td>$!cDate.getEndHour():$!cDate.getEndMin()</td> +<td> </td> + <td> + #foreach ( $cr in $coursePresenter.searchCourseRooms("") ) + #set ($sel = "") + #if ($cr.getId() == $cDate.getRoomId()) + $!cr.getName() + #end + #end + </td> +<td> </td> + <td>von $portalPresenter.dateFormatShort("$!lang", $!cDate.getStartDate())</td> + <td>bis $portalPresenter.dateFormatShort("$!lang", $!cDate.getEndDate())</td> + <td> + #set ($seloption = "$cDate.getCycle()") + #if ( $seloption == "0" ) + täglich/einmalig + #elseif ( $seloption == "1" ) + wöchentlich + #elseif ( $seloption == "2" ) + zweiwöchentlich + #end + </td> + <td> + #set ($seloption = "$cDate.getType()") + #if ( $seloption == "0" ) + + #elseif ( $seloption == "1" ) + Ãbung + #elseif ( $seloption == "2" ) + Zentralübung + #end + </td> +</tr> +#end +</table> + +<p> +#if ($!userLogin != "anonymous") +<form action="/COURSE" method="post"> +<input type="hidden" name="cmd" value="addcoursett"/> +<input type="hidden" name="cid" value="$cid"/> +<input type="hidden" name="uid" value="$auserid"/> +<input type="hidden" name="cmd.success" value="/course/timetable.html"/> +<input type="hidden" name="cmd.error" value="/course/timetable.html"/> +<input type="submit" value="Zum persönlichen Stundenplan hinzufügen"> +</form> +#end + +<p> + +$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) Index: timetablew.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetablew.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- timetablew.html.de 29 May 2006 07:13:31 -0000 1.1 +++ timetablew.html.de 18 Oct 2006 16:51:06 -0000 1.2 @@ -1,61 +1,59 @@ - -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) - -<h1>Stundenplan</h1> - -#if ( $returnCode > 1999 ) -<p><div class="error">Failed inserting/deleting course in timetable.</div></p> -#end -#if ( $returnCode>999 && $returnCode < 1999 ) -<p><div class="success">Succeeded inserting/deleting course in timetable.</div></p> -#end - -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) -#set ( $auserlogin = $userLogin ) -#end - -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) - -#if ( $auserid == 0) -You have to log in first before you can display and edit your timetable. -#else - -#if ( "$!term" == "" ) -#set ( $term = $coursePresenter.getCurrentTerm() ) -#end - -<form action="/course/timetable.html" method="post"> -<p>Timetable for term - <select name="term" size="1"> - $!coursePresenter.getTerms("") - </select> - <input type="submit" class="submit" value="Update timetable view" /> -</p> -</form> - -<ul> - -#set ( $tt = $coursePresenter.getTimetable("$!auserid", "$!term") ) - -#if ("$!tt.size()" == "0") -no entries -#else -#foreach( $cttid in $tt.keySet() ) -<li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getName() </a> - <a href="cupdate.html?cid=$tt.get($cttid).getId()">edit</a> | - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">remove</a> -</li> -#end -#end -</ul> - -#end - -<h3>Week View</h3> - -<p> -$calendarPresenter.printWeekCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") -</p> - -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) + +$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) + +<h1>Stundenplan</h1> + +#if ( $returnCode > 1999 ) +<p><div class="error">Fehler beim Einfügen oder Löschen einer Lehrveranstaltung.</div></p> +#end +#if ( $returnCode>999 && $returnCode < 1999 ) +<p><div class="success">Lehrveranstaltung erfolgreich eingefügt oder gelöscht.</div></p> +#end + +#set ( $auserlogin = "$!auserlogin" ) +#if ( $auserlogin == "" ) +#set ( $auserlogin = $userLogin ) +#end +#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) + +#if ( $auserid == 0) +$portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) +#else + +#if ( "$!term" == "" ) +#set ( $term = $coursePresenter.getCurrentTerm() ) +#end + +<form action="/course/timetablew.html" method="post"> +<p>Stundenplan für Semester + <select name="term" size="1"> + $!coursePresenter.getTerms("$!term") + </select> + <input type="submit" class="submit" value="Semester wechseln" /> +</p> +</form> + +<ul> + +#set ( $tt = $coursePresenter.getTimetable("$!auserid", "$!term") ) + +#if ("$!tt.size()" == "0") +no entries +#else +#foreach( $cttid in $tt.keySet() ) +<li> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetablew.html&cmd.error=/course/timetablew.html">entfernen</a> +</li> +#end +#end +</ul> + +#end + +<h3>Wochenansicht</h3> + +<p> +$calendarPresenter.printWeekCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") +</p> + +$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) Index: clcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clcreate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clcreate.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ clcreate.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -51,8 +51,12 @@ <font size="-1">(Id einer Benutzerkennung auf der Plattform - d.h. eine Zahl - Sie erhalten den Wert beim Editieren Ihres Benutzerprofils.</font>)</td> </tr> <tr> - <td valign="top">External ID<br>(UnivIS-Id)</td> - <td><input name="lextid" size="50" value="$!lextid"></td> + <td valign="top">Externe ID<br>(UnivIS-ID)</td> + <td valign="top"><input name="lextid" size="50" value="$!lextid"></td> +</tr> +<tr> + <td valign="top">Gruppe</td> + <td><input name="lgroup" size="50" value="$!lgroup"></td> </tr> <tr> <td>Typ</td> Index: cm.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cm.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cm.html.en 6 Oct 2006 12:36:31 -0000 1.2 +++ cm.html.en 18 Oct 2006 16:51:06 -0000 1.3 @@ -18,7 +18,8 @@ <a href="cm.html.de?id=$cm.getSId()">Show German version of this module description (sometimes the English content is not complete)</a> <p> -<table border="1"> + +<table border="1pt" width="100%" cellspacing="0pt"> <tr> <td valign=top>Title (German)</td> <td>$!cm.getName()</td> Index: timetable.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetable.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- timetable.html.de 29 May 2006 07:13:31 -0000 1.1 +++ timetable.html.de 18 Oct 2006 16:51:06 -0000 1.2 @@ -1,24 +1,23 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) <h1>Stundenplan</h1> #if ( $returnCode > 1999 ) -<p><div class="error">Failed inserting/deleting course in timetable.</div></p> +<p><div class="error">Fehler beim Einfügen oder Löschen einer Lehrveranstaltung.</div></p> #end #if ( $returnCode>999 && $returnCode < 1999 ) -<p><div class="success">Succeeded inserting/deleting course in timetable.</div></p> +<p><div class="success">Lehrveranstaltung erfolgreich eingefügt oder gelöscht.</div></p> #end #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) #set ( $auserlogin = $userLogin ) #end - #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#if ( $auserid == 0) -You have to log in first before you can display and edit your timetable. +#if ( "$!auserid" == "0") +$portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) #else #if ( "$!term" == "" ) @@ -26,11 +25,11 @@ #end <form action="/course/timetable.html" method="post"> -<p>Timetable for term +<p>Stundenplan für Semester <select name="term" size="1"> - $!coursePresenter.getTerms("$!term") + $!coursePresenter.getTerms("$!term") </select> - <input type="submit" class="submit" value="Update timetable view" /> + <input type="submit" class="submit" value="Semester wechseln" /> </p> </form> @@ -39,12 +38,11 @@ #set ( $tt = $coursePresenter.getTimetable("$!auserid", "$!term") ) #if ("$!tt.size()" == "0") -no entries +keine Einträge #else #foreach( $cttid in $tt.keySet() ) <li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getName() </a> - <a href="cupdate.html?cid=$tt.get($cttid).getId()">edit</a> | - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">remove</a> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">entfernen</a> </li> #end #end @@ -52,10 +50,10 @@ #end -<h3>Day View</h3> +<h3>Tagesansicht</h3> <p> $calendarPresenter.printDayCalendarAsHtml($!datestring, $!catids, "en", "timetable.html", "timetablew.html", "timetablem.html","$!auserid") </p> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) Index: cmcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cmcreate.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ cmcreate.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -211,12 +211,7 @@ </select> </td> <td> - <select name="type$i"> - <option value="">--</option> - #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) - <option value="$i">$i</option> - #end - </select> +$portalPresenter.printSelect("type$i","--,Pflichtfach,Wahlpflichtfach,Wahlfach,Vertiefung,Ergänzungsfach,Graduiertenstudium,Kernfach"," ,pf,wp,wa,vt,er,gr,ke","") </td> <td> <select name="startsem$i"> Index: clupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clupdate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clupdate.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ clupdate.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -54,8 +54,12 @@ <td><input name="luserid" size="5" value="$!courseLecturer.getUserId()"> (Id einer Benutzerkennung auf der Plattform)</td> </tr> <tr> - <td valign="top">External ID<br>(UnivIS Id)</td> - <td><input name="lextid" size="50" value="$!courseLecturer.getExtId()"></td> + <td valign="top">Externe ID<br>(UnivIS-ID)</td> + <td valign="top"><input name="lextid" size="50" value="$!courseLecturer.getExtId()"></td> +</tr> +<tr> + <td valign="top">Gruppe</td> + <td valign="top"><input name="lgroup" size="50" value="$!courseLecturer.getGroup()"></td> </tr> <tr> <td>Typ</td> Index: crsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crsearch.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- crsearch.html.de 6 Oct 2006 12:36:32 -0000 1.3 +++ crsearch.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -11,7 +11,11 @@ #set ( $acc = $userPresenter.checkPermission("$auserid", "course", "create", "") ) #end +#if ("$!crname"!="") #set ($query = "crname=$!{crname}") +#else +#set ($query = "crid=0") +#end <h1>Raumsuche</h1> @@ -19,9 +23,11 @@ #set ( $rcount = $results.size() ) <p> #if ( "$!rcount" == "0" ) +#if ( "$!query" != "crid=0" ) <div class="info">Die Suche hat keine Ergebnisse geliefert.</div> <p> +#end #else Die Suche hat $rcount Ergebnisse geliefert:<p> <table id="result" width="90%" align="center"> Index: timetablem.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetablem.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- timetablem.html.de 29 May 2006 07:13:31 -0000 1.1 +++ timetablem.html.de 18 Oct 2006 16:51:06 -0000 1.2 @@ -1,61 +1,59 @@ - -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) - -<h1>Stundenplan</h1> - -#if ( $returnCode > 1999 ) -<p><div class="error">Failed inserting/deleting course in timetable.</div></p> -#end -#if ( $returnCode>999 && $returnCode < 1999 ) -<p><div class="success">Succeeded inserting/deleting course in timetable.</div></p> -#end - -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) -#set ( $auserlogin = $userLogin ) -#end - -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) - -#if ( $auserid == 0) -You have to log in first before you can display and edit your timetable. -#else - -#if ( "$!term" == "" ) -#set ( $term = $coursePresenter.getCurrentTerm() ) -#end - -<form action="/course/timetable.html" method="post"> -<p>Timetable for term - <select name="term" size="1"> - $!coursePresenter.getTerms("") - </select> - <input type="submit" class="submit" value="Update timetable view" /> -</p> -</form> - -<ul> - -#set ( $tt = $coursePresenter.getTimetable("$!auserid", "$!term") ) - -#if ("$!tt.size()" == "0") -no entries -#else -#foreach( $cttid in $tt.keySet() ) -<li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getName() </a> - <a href="cupdate.html?cid=$tt.get($cttid).getId()">edit</a> | - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">remove</a> -</li> -#end -#end -</ul> - -#end - -<h3>Month View</h3> - -<p> -$calendarPresenter.printMonthCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") -</p> - -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) + +$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) + +<h1>Stundenplan</h1> + +#if ( $returnCode > 1999 ) +<p><div class="error">Fehler beim Einfügen oder Löschen einer Lehrveranstaltung.</div></p> +#end +#if ( $returnCode>999 && $returnCode < 1999 ) +<p><div class="success">Lehrveranstaltung erfolgreich eingefügt oder gelöscht.</div></p> +#end + +#set ( $auserlogin = "$!auserlogin" ) +#if ( $auserlogin == "" ) +#set ( $auserlogin = $userLogin ) +#end +#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) + +#if ( $auserid == 0) +$portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) +#else + +#if ( "$!term" == "" ) +#set ( $term = $coursePresenter.getCurrentTerm() ) +#end + +<form action="/course/timetablem.html" method="post"> +<p>Stundenplan für Semester + <select name="term" size="1"> + $!coursePresenter.getTerms("$!term") + </select> + <input type="submit" class="submit" value="Semester wechseln" /> +</p> +</form> + +<ul> + +#set ( $tt = $coursePresenter.getTimetable("$!auserid", "$!term") ) + +#if ("$!tt.size()" == "0") +no entries +#else +#foreach( $cttid in $tt.keySet() ) +<li> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">entfernen</a> +</li> +#end +#end +</ul> + +#end + +<h3>Monatsansicht</h3> + +<p> +$calendarPresenter.printMonthCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") +</p> + +$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) Index: cpcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpcreate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cpcreate.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ cpcreate.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -12,8 +12,8 @@ #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte -um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else @@ -38,7 +38,7 @@ <td><input name="cpname_en" size="50" value=""></td> </tr> <tr> - <td>Kürzel</td> + <td>Kürzel</td> <td><input name="cplabel" size="50" value=""></td> </tr> <tr> Index: clsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clsearch.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clsearch.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ clsearch.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -12,9 +12,10 @@ #end #set ($tmps = "$!lfirstname$!llastname$!ltyp") -#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}") #if ("$!tmps" == "") -#set ($query = "ltyp=p") +#set ($query = "lid=0") +#else +#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}") #end <h1>Dozentensuche</h1> @@ -23,7 +24,7 @@ #set ( $rcount = $results.size() ) <p> #if ( "$!rcount" == "0" ) -#if ( "$!query" != "cid=0" ) +#if ( "$!query" != "lid=0" ) <div class="info">Die Suche hat keine Ergebnisse geliefert.</div> <p> @@ -41,7 +42,13 @@ <tr> <td>$!c.getLastName()</td> <td>$!c.getFirstName()</td> -<td>$!c.getType() +#set ($type = $!c.getType()) +<td> +#if ($type=="p") +Professor +#elseif ($type=="e") +Externer Dozent +#end </td> <td> #if ( "$!acc" == "true" ) @@ -75,12 +82,7 @@ <tr> <td>Typ</td> <td> - <select name="ltyp"> - <option value="" selected="1">alle</option> - <option value="p">Professoren</option> - <option value="e">Lehrbeauftragte</option> - <option value="a">Assistenten</option> - </select> +$portalPresenter.printSelect("ltyp","alle,Professoren,Externe Dozenten,Assistenten"," ,p,e,a","$!ltyp") </td> </tr> <tr> Index: ccreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/ccreate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ccreate.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ ccreate.html.de 18 Oct 2006 16:51:06 -0000 1.4 @@ -19,7 +19,7 @@ #else #if ( $returnCode > 1999 ) -<font color="red">Fehler beim Anlegen einer Veranstaltung.</font><p> +<font color="error">Fehler beim Anlegen einer Veranstaltung.</font><p> #end #set( $cm = $coursePresenter.getCourseModule($cmid) ) @@ -34,11 +34,11 @@ <h2><a href="/course/cm.html?cmid=$cmid" target="_blank">$cm.getName()</a></h2> -<p>Hinweis: Manche der folgenden Felder sind von dem zugeordneten +<p><em>Hinweis: Manche der folgenden Felder sind von dem zugeordneten Modul übernommen und können nicht geändert werden. Sollten die Angaben für Ihre Veranstaltung nicht korrekt sein, dann wählen Sie ein anderes Modul oder wenden Sie sich an -den Modulverantwortlichen zwecks Anpassung des Moduls.</p> +den Modulverantwortlichen zwecks Anpassung des Moduls.</em></p> <table border="0"> <tr> @@ -57,9 +57,9 @@ </td> </tr> <tr> - <td valign="top">Name</td> - <td><input name="cname" size="50" value="$!cm.getName()"><br> -<font size="-1">Sie können den Modulnamen um einen Untertitel ergänzen, dürfen den Prefix (Modulnamen) aber nicht abändern oder kürzen.</font> + <td valign="top">Untertitel</td> + <td><input name="cname" size="50" value="$!cname"><br> +<font size="-1">Der Untertitel ergänzt den Modulnamen "$!courseModule.getName()".</font> </td> </tr> <tr> @@ -134,8 +134,8 @@ Praktikum: <input name="chours_lab" size="2" value="$!cm.getHoursLab()"> </td> </tr> -<tr><td colspan="2">Die nachfolgenden Informationen sind aus dem Eintrag -des zugehörigen Moduls übernommen und können nicht geändert werden.</font> +<tr><td colspan="2"><b>Die nachfolgenden Informationen sind aus dem Eintrag +des zugehörigen Moduls übernommen und können nicht geändert werden.</b> </td></tr> <tr> <td>Lernziele</td> Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/index.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- index.html.de 6 Oct 2006 12:36:32 -0000 1.5 +++ index.html.de 18 Oct 2006 16:51:06 -0000 1.6 @@ -57,9 +57,12 @@ #if ( $auserid == 0 ) -<p><div class="color2"><b>Ihre Zugriffsrechte:</b><br> -- Sie haben keine Rechte, Veranstaltungen oder Module zu -editieren.</div></p> +<p><div class="color2"><b>Ihre Zugriffsrechte:</b> +<ul> +<li> Sie haben keine Rechte, Veranstaltungen oder Module zu +editieren. +</ul> +</div></p> <h3>Module und Veranstaltungen</h3> <ul> @@ -67,6 +70,8 @@ <p> <li><a href="cmsearch.html">Modulsuche</a> <li><a href="cmall.html">Modulkatalog</a> +<p> +<li><a href="timetable.html">Persönlichen Stundenplan anzeigen und verwalten</a> </ul> #else @@ -84,16 +89,18 @@ #set ( $acc = "course" ) <p><div class="color2"><b>Ihre Zugriffsrechte:</b><br> #set ( $tmps = $userPresenter.checkPermission("$auserid", "coursemodule", "delete", "") ) +<ul> #if ( "$!tmps" == "true" ) -- Editieren von Modulen<br/> -- Editieren von Veranstaltungen<br/> -- Editieren von Dozenten und Räumen +<li> Editieren von Modulen +<li> Editieren von Veranstaltungen +<li> Editieren von Dozenten und Räumen #set ( $acc = "module" ) #else -- Editieren von Veranstaltungen<br/> -- Beantragen von Modulen<br/> -- Editieren von Dozenten und Räumen +<li> Editieren von Veranstaltungen +<li> Beantragen von Modulen +<li> Editieren von Dozenten und Räumen #end +</ul> </div></p> <h3>Veranstaltungsverwaltung</h3> Index: navigation.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/navigation.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- navigation.html.de 6 Oct 2006 12:36:32 -0000 1.4 +++ navigation.html.de 18 Oct 2006 16:51:06 -0000 1.5 @@ -13,7 +13,6 @@ #end #end #end -<TD vAlign=top width=150 bgColor=#e0e0e0 > <BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <BR><A class=hnav href="/course/"><B>COURSE MANAGEMENT</B></A> <BR> @@ -49,5 +48,3 @@ #end <IMG src="/images/spacer160.gif" width=110><BR> - -</TD> Index: cpsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpsearch.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cpsearch.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ cpsearch.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -11,7 +11,11 @@ #set ( $acc = $userPresenter.checkPermission("$auserid", "coursemodule", "delete" ,"") ) #end +#if ("$!cpname"!="") #set ($query = "cpname=$!{cpname}") +#else +#set ($query = "cpid=0") +#end <h1>Studiengangsuche</h1> @@ -19,7 +23,7 @@ #set ( $rcount = $results.size() ) <p> #if ( "$!rcount" == "0" ) -#if ( "$!query" != "cid=0" ) +#if ( "$!query" != "cpid=0" ) <div class="info">Die Suche hat keine Ergebnisse geliefert.</div> <p> @@ -33,15 +37,15 @@ <td>Label</td> <td> </td> </tr> -#foreach ( $c in $results ) +#foreach ( $cp in $results ) <tr> -<td>$!c.getName()</td> -<td>$!c.getNameEn()</td> -<td>$!c.getLabel()</td> +<td>$!cp.getName()</td> +<td>$!cp.getNameEn()</td> +<td>$!cp.getLabel()</td> <td> #if ( "$!acc" == "true" ) -<a href="cpupdate.html?cpid=$!c.getId()">edit</a> | -<a href="cpdelete.html?cpid=$!c.getId()">delete</a> +<a href="cpupdate.html?cpid=$!cp.getId()">editieren</a> | +<a href="cpdelete.html?cpid=$!cp.getId()">löschen</a> #end </td> </tr> Index: cm.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cm.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cm.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ cm.html.de 18 Oct 2006 16:51:06 -0000 1.3 @@ -15,7 +15,7 @@ #set ( $auser = $userManager.getUser($auserid)) #set ( $acc = $userPresenter.checkPermission("$auserid", "course", "create", "") ) -<table border="1"> +<table border="1pt" width="100%" cellspacing="0pt"> <tr> <td valign=top>Titel (de)</td> <td>$!cm.getName()</td> Index: cupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cupdate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cupdate.html.de 6 Oct 2006 12:36:32 -0000 1.4 +++ cupdate.html.de 18 Oct 2006 16:51:06 -0000 1.5 @@ -56,9 +56,9 @@ </td> </tr> <tr> - <td valign="top">Name</td> - <td><input name="cname" size="70" value="$!course.getName()"><br> -<font size="-1">Sie können den Modulnamen um einen Untertitel ergänzen, dürfen den Prefix (Modulnamen) aber nicht abändern oder kürzen.</font> + <td valign="top">Untertitel</td> + <td valign="top"><input name="cname" size="70" value="$!course.getName()"><br> +<font size="-1">Der Untertitel ergänzt den Modulnamen "$!courseModule.getName()".</font> </td> </tr> <tr> |
