Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Wolfgang W. <wo...@us...> - 2009-08-07 06:17:15
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23623/src/de/tum/cobricks/course Modified Files: generateListDeputate.java Log Message: Index: generateListDeputate.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateListDeputate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- generateListDeputate.java 23 Aug 2007 05:39:11 -0000 1.2 +++ generateListDeputate.java 7 Aug 2009 06:16:52 -0000 1.3 @@ -187,8 +187,79 @@ out.print(cm.getSId()+" ; "+cid.toString()+" ; " +c.getFullName()); - out.print(" ; "+cm.getType()+" ; " - +c.getHours()+" ; "); + out.print(" ; "+cm.getType()+" ; "); +// +c.getHours()+" ; "); + + // Neu: SWS nach Kurstyp + int counter1 = 0; + int swsvl = c.getHoursLecture(); + if (swsvl > 0) + { + counter1 ++; + } + + int swsue = c.getHoursExercises(); + if (swsue > 0) + { + if (counter1 > 0) + counter1 ++; + } + + int swsse = c.getHoursSeminar(); + if (swsse > 0) + { + if (counter1 > 0) + counter1 ++; + } + + int swspr = c.getHoursLab(); + if (swspr > 0) + { + if (counter1 > 0) + counter1 ++; + } + + // SWS + int counter2 = 0; + + if (swsvl > 0) + { + counter2 ++; + out.print (swsvl); + out.print ("V"); + } + + if (swsue > 0) + { + if (counter2 > 0) + out.print("+"); + counter2 ++; + out.print (swsue); + out.print ("Ü"); + } + + if (swsse > 0) + { + if (counter2 > 0) + out.print("+"); + counter2 ++; + out.print (swsse); + out.print ("S"); + } + + if (swspr > 0) + { + if (counter2 > 0) + out.print("+"); + counter2 ++; + out.print (swspr); + out.print ("P"); + } + + out.print (" ; "); + // Ende Neu + + List ll = courseManager.getLecturersForCourse(cid.intValue()); Iterator ii = ll.iterator(); String clgroup = null; |
|
From: Wolfgang W. <wo...@us...> - 2009-08-07 06:17:02
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23623/src/de/tum/cobricks/user Modified Files: LdapUserHandlerMyTUM.java Log Message: Index: LdapUserHandlerMyTUM.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/user/LdapUserHandlerMyTUM.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- LdapUserHandlerMyTUM.java 20 Mar 2007 09:35:13 -0000 1.8 +++ LdapUserHandlerMyTUM.java 7 Aug 2009 06:16:52 -0000 1.9 @@ -200,8 +200,11 @@ String userbase = coreManager.getProperty("user.domain."+domain +".ldap.rootdn"); - String filter ="(&(&(authlogin=" + userlogin + ")"; - filter += "(&(authOrganisationseinheit=*Informatik*)(authRolle=tumMitarbeiter*))))"; + // String filter ="(&(&(authlogin=" + userlogin + ")"; + // filter += "(&(authOrganisationseinheit=*Informatik*)(authRolle=tumMitarbeiter*))))"; + + String filter ="(&(imEmailAdressen=" + userlogin + ")(imOrgZugMitarbeiter=TUIN*))"; // 07.08.09 + logger.debug("filter = "+filter); String cn=""; String[] returnAttribut = {"cn"}; @@ -273,7 +276,10 @@ String userbase = coreManager. getProperty("user.domain."+domain+".ldap.rootdn"); - String filter ="(authlogin="+userlogin+")"; + // String filter ="(authlogin="+userlogin+")"; + + String filter = "(imEmailAdressen="+userlogin+")"; // 07.08.09 + String[] returnAttribut = {"cn"}; // Set up the search controls |
|
From: Wolfgang W. <wo...@us...> - 2009-08-07 06:17:02
|
Update of /cvsroot/cobricks/drehscheibe-in In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23623 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- build.xml 20 Jan 2009 07:38:31 -0000 1.17 +++ build.xml 7 Aug 2009 06:16:52 -0000 1.18 @@ -412,7 +412,7 @@ classname="de.tum.cobricks.course.generateListDeputate" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2009"/> </java> </target> |
|
From: Wolfgang W. <wo...@us...> - 2009-01-20 07:38:43
|
Update of /cvsroot/cobricks/drehscheibe-in In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31390 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- build.xml 9 Jan 2009 10:19:09 -0000 1.16 +++ build.xml 20 Jan 2009 07:38:31 -0000 1.17 @@ -403,7 +403,7 @@ classname="de.tum.cobricks.course.generateHTMLOverviews" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008 test"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2009 test"/> </java> </target> @@ -421,7 +421,7 @@ classname="de.tum.cobricks.course.generateListExams" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2009"/> </java> </target> |
|
From: Wolfgang W. <wo...@us...> - 2009-01-20 07:38:38
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31390/src/de/tum/cobricks/course Modified Files: generateHTMLOverviews.java Log Message: Index: generateHTMLOverviews.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateHTMLOverviews.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- generateHTMLOverviews.java 9 Jan 2009 10:19:09 -0000 1.15 +++ generateHTMLOverviews.java 20 Jan 2009 07:38:31 -0000 1.16 @@ -262,13 +262,13 @@ out.println(ke); } - /* + out.println("<P><a name=\"bsi-sem\"></a><h3>Seminare</h3>"); tmpi = getData(out, "BS-INF", "Seminar", ""); if (tmpi < 1) { out.println(ke); } - */ + out.println("<P><a name=\"bsi-prakt\"></a><h3>Praktika</h3>"); tmpi = getData(out, "BS-INF", "Praktikum", ""); |
|
From: Wolfgang W. <wo...@us...> - 2009-01-09 10:19:16
|
Update of /cvsroot/cobricks/drehscheibe-in In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14989 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- build.xml 14 Jul 2008 10:49:12 -0000 1.15 +++ build.xml 9 Jan 2009 10:19:09 -0000 1.16 @@ -412,7 +412,7 @@ classname="de.tum.cobricks.course.generateListDeputate" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008"/> + <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008"/> </java> </target> |
|
From: Wolfgang W. <wo...@us...> - 2009-01-09 10:19:16
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14989/src/de/tum/cobricks/course Modified Files: generateHTMLOverviews.java Log Message: Index: generateHTMLOverviews.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateHTMLOverviews.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- generateHTMLOverviews.java 15 Jul 2008 12:32:34 -0000 1.14 +++ generateHTMLOverviews.java 9 Jan 2009 10:19:09 -0000 1.15 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 Cobricks Group. All rights reserved. +F * Copyright (c) 2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -66,7 +66,7 @@ { String confdir = "WEB-INF/conf"; querysem = "SS"; - queryjahr = 2008; + queryjahr = 2009; if (args.length > 0) confdir = args[0]; if (args.length > 1) @@ -141,15 +141,10 @@ { String filename = "vv" + querysem; String year = Integer.toString(queryjahr); - - // Mail Manfred: Dateiname soll immer "2008" enthalten, nicht nur 08 -/* if (querysem.equals("SS") && year.length() > 2) - filename += year.substring(2,4); // Example SS 2007 -> file name with 07 only - else +// if (querysem.equals("SS") && year.length() > 2) +// filename += year.substring(2,4); // Example SS 2007 -> file name with 07 only +// else filename += year; - */ - - filename += year; try { makeInformatik(new File(filename+"-info.html")); @@ -163,7 +158,7 @@ // makeMCoMe(new File(filename+"-mcome.html")); // makeMhoncseome(new File(filename+"-mhoncseome.html")); - // makeInternational(new File(filename+"-intern.html")); + makeInternational(new File(filename+"-intern.html")); } catch (Exception e) { logger.error(LogUtil.ex("failed", e)); @@ -187,14 +182,16 @@ String outs = "<p>Diese Übersicht zeigt alle Veranstaltungen für das "+ - "oben angegebene Semester (Stand: "+df.format(today)+").<p> "+ - "(Geplante) Veranstaltungen anderer Semester oder "+ - "<a href=\"/studium/studiengaenge/index.html\">"+ - "anderer Studiengänge</a> können Sie über die "+ - "<a href=\"/myintum/kurs_verwaltung/csearch.html\">"+ - "Veranstaltungssuche</a> oder über die <a href=\""+ - "/studium/vvindex.html\">Links "+ - "zu anderen Veranstaltungsübersichten</a> finden.</p>"; + "oben angegebene Semester (Stand: "+df.format(today)+").</p> "+ +// "(Geplante) Veranstaltungen anderer Semester oder "+ +// "<a href=\"/studium/studiengaenge/index.html\">"+ +// "anderer Studiengänge</a> können Sie über die "+ +// "<a href=\"/myintum/kurs_verwaltung/csearch.html\">"+ +// "Veranstaltungssuche</a> oder über die <a href=\""+ +// "/studium/vvindex.html\">Links "+ +// "zu anderen Veranstaltungsübersichten</a> finden.</p>"; + "<p><a href=\"/myintum/kurs_verwaltung/csearch.html\">"+ + "Veranstaltungssuche</a></p>"; out.println(outs); } @@ -265,11 +262,13 @@ out.println(ke); } + /* out.println("<P><a name=\"bsi-sem\"></a><h3>Seminare</h3>"); tmpi = getData(out, "BS-INF", "Seminar", ""); if (tmpi < 1) { out.println(ke); } + */ out.println("<P><a name=\"bsi-prakt\"></a><h3>Praktika</h3>"); tmpi = getData(out, "BS-INF", "Praktikum", ""); @@ -1081,22 +1080,21 @@ printHeader(out); out.println("<ul>\n"); - out.println("<LI><a href=\"#mcse-vorl\">Vorlesungen/Lectures</a>\n"); - out.println("<li><a href=\"#mcse-sem\">Seminare/Seminars</a>\n"); - out.println("<li><a href=\"#mcse-prakt\">Praktika/Lab Courses</a>\n"); - out.println("<li><a href=\"#mcse-honours\">Honours-Studiengang/Honours Courses</a>\n"); + out.println("<LI><a href=\"#mcse-vorl\">Vorlesungen</a>\n"); + out.println("<li><a href=\"#mcse-sem\">Seminare</a>\n"); + out.println("<li><a href=\"#mcse-prakt\">Praktika</a>\n"); out.println("</ul><p>\n"); int tmpi; - out.println("<P><a name=\"mcse-vorl\"></a><h3>Vorlesungen/Lectures</h3>"); + out.println("<P><a name=\"mcse-vorl\"></a><h3>Vorlesungen</h3>"); tmpi = getData(out, "MS-CSEINF", "Vorlesung", ""); tmpi += getData(out, "MS-CSEINF", "Übung", ""); if (tmpi < 1) { out.println(ke); } - out.println("<P><a name=\"mcse-sem\"></a><h3>Seminare/Seminars</h3>"); + out.println("<P><a name=\"mcse-sem\"></a><h3>Seminare</h3>"); tmpi = getData(out, "MS-CSEINF", "Seminar", ""); tmpi += getData(out, "MS-CSEINF", "Proseminar", ""); if (tmpi < 1) { @@ -1104,22 +1102,12 @@ } - out.println("<P><a name=\"mcse-prakt\"></a><h3>Praktika/Lab Courses</h3>"); + out.println("<P><a name=\"mcse-prakt\"></a><h3>Praktika</h3>"); tmpi = getData(out, "MS-CSEINF", "Praktikum", ""); if (tmpi < 1) { out.println(ke); } - out.println("<P><a name=\"mcse-honours\"></a><h3>Honours-Studiengang/Honours Courses</h3>"); - tmpi = getData(out, "MSHON-CSE-COME", "Vorlesung", ""); - tmpi += getData(out, "MSHON-CSE-COME", "Übung", ""); - tmpi += getData(out, "MSHON-CSE-COME", "Seminar", ""); - tmpi += getData(out, "MSHON-CSE-COME", "Proseminar", ""); - tmpi += getData(out, "MSHON-CSE-COME", "Praktikum", ""); - if (tmpi < 1) { - out.println(ke); - } - printFooter(out); out.println("\n$portalPresenter.parse(\"/pagefooter.html\", $portalRequest)"); |
|
From: Wolfgang W. <wo...@us...> - 2009-01-03 10:44:04
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15850/src/org/cobricks/course Modified Files: CoursePresenter.java Log Message: Index: CoursePresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CoursePresenter.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- CoursePresenter.java 29 Dec 2008 09:52:26 -0000 1.37 +++ CoursePresenter.java 3 Jan 2009 10:43:57 -0000 1.38 @@ -819,7 +819,7 @@ tmps2 = ((Element)node). getAttribute("comment"); if (inhtml) { - sb.append("<a href=\"cm.html?" + sb.append("<a href=\"http://drehscheibe.in.tum.de/myintum/kurs_verwaltung/cm.html?" +"id=").append(idref). append("\" target=\"drehscheibe\">").append("Modul "). append(idref).append("</a>"); |
|
From: Wolfgang W. <wo...@us...> - 2008-12-29 09:52:36
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31861/src/org/cobricks/course Modified Files: CoursePresenter.java Log Message: Index: CoursePresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CoursePresenter.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- CoursePresenter.java 14 Jul 2008 10:47:23 -0000 1.36 +++ CoursePresenter.java 29 Dec 2008 09:52:26 -0000 1.37 @@ -622,7 +622,7 @@ } return sb.toString(); } - + public String printPrerequ(CourseModule cm, String lang) { return printPrerequ(cm, lang, true); @@ -658,6 +658,42 @@ } return ""; } + + public String printPrerequTG(CourseModule cm, String lang) + { + return printPrerequTG(cm, lang, true); + } + + public String printPrerequTG(CourseModule cm, String lang, boolean inhtml) + { + if (cm == null) return ""; + try { + String tmps = cm.getPrerequ(); + return printPrerequTG(tmps, lang, inhtml); + } catch (Exception e) { + logger.error(LogUtil.ex("failed", e)); + } + return ""; + } + + public String printPrerequTG(Course c, String lang) + { + return printPrerequTG(c, lang, true); + } + + public String printPrerequTG(Course c, String lang, boolean inhtml) + { + if (c == null) return ""; + try { + String tmps = c.getPrerequ(); + if (tmps==null || tmps.length()<1) + tmps = c.getCourseModule().getPrerequ(); + return printPrerequTG(tmps, lang, inhtml); + } catch (Exception e) { + logger.error(LogUtil.ex("failed", e)); + } + return ""; + } public String printPrerequ(String tmps, String lang, boolean inhtml) { @@ -737,6 +773,86 @@ } return sb.toString(); } + + public String printPrerequTG(String tmps, String lang, boolean inhtml) + // Print prerequisites with link to target="drehscheibe" (woerndl, 29.12.2008) + { + // is it XML? + if (tmps==null) return ""; + tmps = tmps.trim(); + if (!tmps.startsWith("<")) { + return tmps; + } + // yes + StringBuffer sb = new StringBuffer(""); + // parse prerequ as XML document + try { + DocumentBuilderFactory factory = + DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + Reader reader = new StringReader(tmps); + InputSource in = new InputSource(reader); + Document doc = builder.parse(in); + Node node = doc.getFirstChild(); + if (node instanceof Element) { + String tagName = ((Element)node).getTagName(); + if (tagName.equals("Vorkenntnisse")) { + node = ((Element)node).getFirstChild(); + while (node != null) { + if (node instanceof Element) { + tagName = ((Element)node).getTagName(); + if (tagName.equals("Vorkenntnis")) { + if (sb.length()>0) { + if (inhtml) + sb.append("<br>\n"); + else + sb.append("; "); + } + String art = ((Element)node). + getAttribute("art"); + if (art.equals("Modul")) { + String idref = ((Element)node). + getAttribute("idref"); + String tmps2 = ((Element)node). + getAttribute("kommentar"); + if (lang!=null && lang.equals("en")) + tmps2 = ((Element)node). + getAttribute("comment"); + if (inhtml) { + sb.append("<a href=\"cm.html?" + +"id=").append(idref). + append("\" target=\"drehscheibe\">").append("Modul "). + append(idref).append("</a>"); + } else { + sb.append("Modul "). + append(idref); + } + if (tmps2!=null && tmps2.length()>0) + sb.append(" (").append(tmps2). + append(")"); + } else { + String tmps2 = ((Element)node). + getAttribute("kommentar"); + if (lang!=null && lang.equals("en")) { + tmps2 = ((Element)node). + getAttribute("comment"); + } + if (tmps2!=null && tmps2.length()>0) + sb.append(tmps2); + } + } + } + node = node.getNextSibling(); + } + } + } + } catch (Throwable e) { + logger.warn("Failed parsing prerequ: "+ e.toString()); + tmps = org.cobricks.portal.PortalPresenter.escapeHTML(tmps); + return tmps; + } + return sb.toString(); + } public String printCert(CourseModule cm) { |
|
From: Wolfgang W. <wo...@us...> - 2008-10-23 14:42:01
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1409/src/org/cobricks/course Modified Files: CourseModule.java CourseModulePrerequisuites.java Log Message: Index: CourseModule.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseModule.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CourseModule.java 14 Jul 2008 10:47:23 -0000 1.8 +++ CourseModule.java 23 Oct 2008 14:41:46 -0000 1.9 @@ -126,6 +126,14 @@ return null; } + public int getEctsCreditsInt() + { + Float f = this.getEctsCredits(); + + if (f == null) return 0; + return f.intValue(); + } + public String getContent() { return (String)attrs.get("cmcontent"); Index: CourseModulePrerequisuites.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseModulePrerequisuites.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CourseModulePrerequisuites.java 14 Jul 2008 10:48:54 -0000 1.1 +++ CourseModulePrerequisuites.java 23 Oct 2008 14:41:46 -0000 1.2 @@ -70,6 +70,30 @@ catch (Exception e) { } return null; } + + public String getPrerequModuleName() + { + try + { + CourseModule pcm = new CourseModule (); + pcm = cman.getCourseModule (cmprrequ); + return pcm.getName(); + } + catch (Exception e) { } + return null; + } + + public String getPrerequModuleNameEn() + { + try + { + CourseModule pcm = new CourseModule (); + pcm = cman.getCourseModule (cmprrequ); + return pcm.getName("en"); + } + catch (Exception e) { } + return null; + } /** * Load course attributes from a Map object - e.g. one retrieved |
|
From: Wolfgang W. <wo...@us...> - 2008-07-15 12:32:41
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22954/src/de/tum/cobricks/course Modified Files: generateHTMLOverviews.java Log Message: Index: generateHTMLOverviews.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateHTMLOverviews.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- generateHTMLOverviews.java 15 Jul 2008 07:31:26 -0000 1.13 +++ generateHTMLOverviews.java 15 Jul 2008 12:32:34 -0000 1.14 @@ -1081,22 +1081,22 @@ printHeader(out); out.println("<ul>\n"); - out.println("<LI><a href=\"#mcse-vorl\">Vorlesungen</a>\n"); - out.println("<li><a href=\"#mcse-sem\">Seminare</a>\n"); - out.println("<li><a href=\"#mcse-prakt\">Praktika</a>\n"); - out.println("<li><a href=\"#mcse-honours\">Honours-Studiengang</a>\n"); + out.println("<LI><a href=\"#mcse-vorl\">Vorlesungen/Lectures</a>\n"); + out.println("<li><a href=\"#mcse-sem\">Seminare/Seminars</a>\n"); + out.println("<li><a href=\"#mcse-prakt\">Praktika/Lab Courses</a>\n"); + out.println("<li><a href=\"#mcse-honours\">Honours-Studiengang/Honours Courses</a>\n"); out.println("</ul><p>\n"); int tmpi; - out.println("<P><a name=\"mcse-vorl\"></a><h3>Vorlesungen</h3>"); + out.println("<P><a name=\"mcse-vorl\"></a><h3>Vorlesungen/Lectures</h3>"); tmpi = getData(out, "MS-CSEINF", "Vorlesung", ""); tmpi += getData(out, "MS-CSEINF", "Übung", ""); if (tmpi < 1) { out.println(ke); } - out.println("<P><a name=\"mcse-sem\"></a><h3>Seminare</h3>"); + out.println("<P><a name=\"mcse-sem\"></a><h3>Seminare/Seminars</h3>"); tmpi = getData(out, "MS-CSEINF", "Seminar", ""); tmpi += getData(out, "MS-CSEINF", "Proseminar", ""); if (tmpi < 1) { @@ -1104,13 +1104,13 @@ } - out.println("<P><a name=\"mcse-prakt\"></a><h3>Praktika</h3>"); + out.println("<P><a name=\"mcse-prakt\"></a><h3>Praktika/Lab Courses</h3>"); tmpi = getData(out, "MS-CSEINF", "Praktikum", ""); if (tmpi < 1) { out.println(ke); } - out.println("<P><a name=\"mcse-honours\"></a><h3>Honours-Studiengang</h3>"); + out.println("<P><a name=\"mcse-honours\"></a><h3>Honours-Studiengang/Honours Courses</h3>"); tmpi = getData(out, "MSHON-CSE-COME", "Vorlesung", ""); tmpi += getData(out, "MSHON-CSE-COME", "Übung", ""); tmpi += getData(out, "MSHON-CSE-COME", "Seminar", ""); |
|
From: Wolfgang W. <wo...@us...> - 2008-07-15 07:31:29
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11411/src/de/tum/cobricks/course Modified Files: generateHTMLOverviews.java Log Message: Index: generateHTMLOverviews.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateHTMLOverviews.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- generateHTMLOverviews.java 20 May 2008 14:07:05 -0000 1.12 +++ generateHTMLOverviews.java 15 Jul 2008 07:31:26 -0000 1.13 @@ -163,7 +163,7 @@ // makeMCoMe(new File(filename+"-mcome.html")); // makeMhoncseome(new File(filename+"-mhoncseome.html")); - makeInternational(new File(filename+"-intern.html")); + // makeInternational(new File(filename+"-intern.html")); } catch (Exception e) { logger.error(LogUtil.ex("failed", e)); @@ -1084,6 +1084,7 @@ out.println("<LI><a href=\"#mcse-vorl\">Vorlesungen</a>\n"); out.println("<li><a href=\"#mcse-sem\">Seminare</a>\n"); out.println("<li><a href=\"#mcse-prakt\">Praktika</a>\n"); + out.println("<li><a href=\"#mcse-honours\">Honours-Studiengang</a>\n"); out.println("</ul><p>\n"); int tmpi; @@ -1109,6 +1110,16 @@ out.println(ke); } + out.println("<P><a name=\"mcse-honours\"></a><h3>Honours-Studiengang</h3>"); + tmpi = getData(out, "MSHON-CSE-COME", "Vorlesung", ""); + tmpi += getData(out, "MSHON-CSE-COME", "Übung", ""); + tmpi += getData(out, "MSHON-CSE-COME", "Seminar", ""); + tmpi += getData(out, "MSHON-CSE-COME", "Proseminar", ""); + tmpi += getData(out, "MSHON-CSE-COME", "Praktikum", ""); + if (tmpi < 1) { + out.println(ke); + } + printFooter(out); out.println("\n$portalPresenter.parse(\"/pagefooter.html\", $portalRequest)"); |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:49:16
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17718/src/de/tum/cobricks/course Modified Files: generateListExams.java Log Message: Index: generateListExams.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateListExams.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- generateListExams.java 20 May 2008 14:07:05 -0000 1.2 +++ generateListExams.java 14 Jul 2008 10:49:12 -0000 1.3 @@ -197,17 +197,62 @@ out.print(cl.getName()); if (ii.hasNext()) out.print(", "); - } + } + // Additional attributes + out.print("; cname=" + c.getName()); + out.print("; ccomment=" + c.getComment()); + out.print("; curl=" + c.getUrl()); + out.print("; ccapacity=" + c.getCapacity()); + out.print("; craumausstatt=" + c.getRaumausstatt()); + // New, for exam planning out.print("; cexamform=" + c.getExamform()); out.print("; cexamrepeat=" + c.getExamrepeat()); out.print("; cexamweek=" + c.getExamweek()); out.print("; cexamrepeatweek=" + c.getExamrepeatweek()); - // New - out.print("; craumausstatt=" + c.getRaumausstatt()); + // Begin dates + int count=0; + List cdates = c.getCourseDates(); + Iterator i2 = cdates.iterator(); + + while (i2.hasNext()) + { + CourseDate cd = (CourseDate)i2.next(); + + out.print ("; weekday" + count + "="); + + int tewotag = cd.getWeekday(); + + switch (tewotag) { + case 1: out.print("So "); break; + case 2: out.print("Mo "); break; + case 3: out.print("Di "); break; + case 4: out.print("Mi "); break; + case 5: out.print("Do "); break; + case 6: out.print("Fr "); break; + case 7: out.print("Sa "); break; + } + + out.print ("; time" + count + "=" + cd.getStartHour() + ":" + cd.getStartMin() + "-" + cd.getEndHour() + ":" + cd.getEndMin()); + CourseRoom room = cd.getRoom(); + if (room != null) + { + out.print ("; room" + count + "=" + room.getName()); + } + else + { + out.print ("; room" + count + "="); + } + + count ++; + } + + // End dates + + out.println(""); } catch (Exception e) { } |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:49:16
|
Update of /cvsroot/cobricks/drehscheibe-in/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17718/conf Modified Files: log.properties Log Message: Index: log.properties =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/conf/log.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- log.properties 6 Oct 2006 12:36:31 -0000 1.5 +++ log.properties 14 Jul 2008 10:49:12 -0000 1.6 @@ -3,7 +3,7 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%7p (%F:%L) - %m%n -log4j.logger.org.cobricks=DEBUG +log4j.logger.org.cobricks=WARN log4j.logger.org.cobricks.portal.velocity=WARN log4j.logger.org.apache=WARN |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:49:16
|
Update of /cvsroot/cobricks/drehscheibe-in In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17718 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- build.xml 20 May 2008 14:07:05 -0000 1.14 +++ build.xml 14 Jul 2008 10:49:12 -0000 1.15 @@ -403,7 +403,7 @@ classname="de.tum.cobricks.course.generateHTMLOverviews" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008 test"/> + <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008 test"/> </java> </target> @@ -421,7 +421,7 @@ classname="de.tum.cobricks.course.generateListExams" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008"/> + <arg line="build/webapps/ROOT/WEB-INF/conf WS 2008"/> </java> </target> |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:49:00
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17344/src/org/cobricks/course Added Files: CourseModulePrerequisuites.java Log Message: --- NEW FILE: CourseModulePrerequisuites.java --- /* * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software * License, either version 1.0 of the License, or (at your option) any * later version (see www.cobricks.de). * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. */ package org.cobricks.course; import java.util.Map; import org.apache.log4j.Logger; /** * * @author mic...@ac... * @author wo...@in... * @version $Date: 2008/07/14 10:48:54 $ */ public class CourseModulePrerequisuites { static Logger logger = Logger.getLogger(CourseModulePrerequisuites.class); int cmprrequ; // prerequisuite module id int cmprid; // module id String cmprlevel; CourseModule cm; CourseManager cman; /** * */ public CourseModulePrerequisuites() { logger.debug("CourseModulePrerequisuites"); } public int getPrerequModuleId() { return cmprrequ; } public int getModuleId() { return cmprid; } public String getLevel() { return cmprlevel; } public String getPrerequModuleSId() { try { CourseModule pcm = new CourseModule (); pcm = cman.getCourseModule (cmprrequ); return pcm.getSId(); } catch (Exception e) { } return null; } /** * Load course attributes from a Map object - e.g. one retrieved * from a database */ public void loadFromMap(Map map, CourseManager courseManager) { loadFromMap(map, courseManager, null); } public void loadFromMap(Map map, CourseManager courseManager, CourseModule cm) { logger.debug("Entering CourseModulePrerequisuites.loadFromMap ..."); Integer tmpi = (Integer)map.get("cmprid"); logger.debug("cmprid = " + tmpi.toString()); cman = courseManager; if (tmpi!=null) cmprid = tmpi.intValue(); if (cm == null) { try { logger.debug("CourseModulePrerequisuites.loadFromMap - 1 -"); this.cm = courseManager.getCourseModule(cmprid); } catch (Exception e) { } } else { logger.debug("CourseModulePrerequisuites.loadFromMap - 2 -"); this.cm = cm; } logger.debug("CourseModulePrerequisuites.loadFromMap - 3 -"); tmpi = (Integer)map.get("cmprrequ"); logger.debug("cmprrequ = " + tmpi.toString()); if (tmpi!=null) cmprrequ = tmpi.intValue(); cmprlevel = (String)map.get("cmprlevel"); logger.debug("cmprlevel = " + tmpi.toString()); logger.debug("Leaving CourseModulePrerequisuites.loadFromMap ..."); } } |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:48:58
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17344/src/org/cobricks/course/db Added Files: course_lecturermod.xml course_modprerequ.xml Log Message: --- NEW FILE: course_modprerequ.xml --- <tabledescriptor tablename="course_modprerequ"> <table version="1"> <tablelayout> <column name="cmprrequ" type="int" notnull="true"/> <column name="cmprid" type="int" notnull="true"/> <column name="cmprlevel" type="varchar(10)"/> <index name="course_modprerequ_cmprrequ"> <colname>cmprrequ</colname> </index> <index name="course_modprerequ_cmprid"> <colname>cmprid</colname> </index> </tablelayout> </table> </tabledescriptor> --- NEW FILE: course_lecturermod.xml --- <tabledescriptor tablename="course_lecturermod"> <table version="1"> <tablelayout> <column name="lid" type="int" notnull="true"/> <column name="cmid" type="int" notnull="true"/> <index name="courselectmod_lid"> <colname>lid</colname> </index> <index name="courselectmod_cmid"> <colname>cmid</colname> </index> </tablelayout> </table> </tabledescriptor> |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:47:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16761/src/org/cobricks/course Modified Files: CourseLecturer.java CourseManager.java CourseManagerImpl.java CourseModule.java CoursePresenter.java CourseServlet.java Log Message: Index: CoursePresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CoursePresenter.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- CoursePresenter.java 23 Jan 2007 21:35:09 -0000 1.35 +++ CoursePresenter.java 14 Jul 2008 10:47:23 -0000 1.36 @@ -279,6 +279,34 @@ return null; } + /** + * New method for course module lecturers (woerndl, 05.06.08) + */ + public List getLecturersForCourseModule(String cmid) + { + try { + return courseManager. + getLecturersForCourseModule(Integer.parseInt(cmid.trim())); + } catch(Exception e ){ + logger.error(LogUtil.ex("Failed getting lecturers for course.", e)); + } + return null; + } + + /** + * New method for course module lecturers (woerndl, 20.06.08) + */ + public List getPrerequisitesForCourseModule(String cmid) + { + try { + return courseManager. + getPrerequisitesForCourseModule(cmid); + } catch(Exception e ){ + logger.error(LogUtil.ex("Failed getting prerequisites for course.", e)); + } + return null; + } + public CourseRoom getCourseRoom(String crid) { try { return courseManager.getRoom(Integer.parseInt(crid.trim())); Index: CourseServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseServlet.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- CourseServlet.java 20 May 2008 14:07:34 -0000 1.32 +++ CourseServlet.java 14 Jul 2008 10:47:23 -0000 1.33 @@ -503,12 +503,14 @@ */ protected Map getCourseModuleRequestParameters(PortalRequest prequest) { + int cmid = 0; + Map attrs = new HashMap(); String tmps = prequest.getRequestParameter("cmid"); if (tmps != null) { try { - int tmpi = Integer.parseInt(tmps); - attrs.put("cmid", new Integer(tmpi)); + cmid = Integer.parseInt(tmps); + attrs.put("cmid", new Integer(cmid)); } catch (Exception e) { } } attrs.put("cmsid", prequest.getRequestParameter("cmsid")); @@ -548,6 +550,25 @@ attrs.put("cmaddxml", prequest. getRequestParameter("cmaddxml")); attrs.put("cmcycle", prequest.getRequestParameter("cmcycle")); + + attrs.put("cmniveau", prequest.getRequestParameter("cmniveau")); + attrs.put("cmworkload1", prequest.getRequestParameter("cmworkload1")); + attrs.put("cmworkload2", prequest.getRequestParameter("cmworkload2")); + attrs.put("cmpruefungsart", prequest.getRequestParameter("cmpruefungsart")); + attrs.put("cmpruefungsdauer", prequest.getRequestParameter("cmpruefungsdauer")); + attrs.put("cmhausaufgaben", prequest.getRequestParameter("cmhausaufgaben")); + attrs.put("cmhausarbeit", prequest.getRequestParameter("cmhausarbeit")); + attrs.put("cmvortrag", prequest.getRequestParameter("cmvortrag")); + attrs.put("cmgespraech", prequest.getRequestParameter("cmgespraech")); + attrs.put("cmwdhauchfolgesem", prequest.getRequestParameter("cmwdhauchfolgesem")); + attrs.put("cmwdhauchsemende", prequest.getRequestParameter("cmwdhauchsemende")); + attrs.put("cmmedia", prequest.getRequestParameter("cmmedia")); + attrs.put("cmliterature", prequest.getRequestParameter("cmliterature")); + attrs.put("cmsubjectarea", prequest.getRequestParameter("cmsubjectarea")); + attrs.put("cmareadipl", prequest.getRequestParameter("cmareadipl")); + attrs.put("cmprereqcomment", prequest.getRequestParameter("cmprereqcomment")); + attrs.put("cmprereqcomment_en", prequest.getRequestParameter("cmprereqcomment_en")); + tmps = prequest.getRequestParameter("cmhidden"); if (tmps != null) { try { @@ -606,6 +627,20 @@ attrs.put("cmprogcnt", new Integer(maxcnt)); } } + + // Course Module Prerequisites TODO + for(int i=1; i<=maxcnt; i++ ) + { + tmps = prequest.getRequestParameter("cmprrequ"+i); + if (tmps != null) { + try { + int tmpi = Integer.parseInt(tmps); + attrs.put("cmprrequ"+i, new Integer(tmpi)); + } catch (Exception e) { } + } + + attrs.put("cmprlevel"+i, prequest.getRequestParameter("cmprlevel"+i)); + } for(int i=1; i<=maxcnt; i++ ){ tmps = prequest.getRequestParameter("cpid"+i); @@ -671,6 +706,37 @@ } } + // Collecting LecturerIds for Course Lecturers Relation (woerndl, 05.06.08) + tmps = prequest.getRequestParameter("lecturerid"); + if (tmps != null) { + try { + attrs.put("newlecturerid", tmps); + } catch (Exception e) { } + } + tmps = prequest.getRequestParameter("lecturername"); + if (tmps != null) { + try { + attrs.put("newlecturername", tmps); + } catch (Exception e) { } + } + + // Used only by updateCourseModule + if(cmid > 0){ + List lecturers = courseManager.getLecturersForCourseModule(cmid); + List lecturersNew = new ArrayList(); + Iterator iter = lecturers.iterator(); + while (iter.hasNext()) { + CourseLecturer element = (CourseLecturer) iter.next(); + tmps = prequest. + getRequestParameter("lecturer"+element.getId()); + logger.debug("lecturer : "+tmps+" : "+element.getId()); + if (tmps != null && tmps.equalsIgnoreCase("true")) { + lecturersNew.add(new Integer(element.getId())); + } + } + if(lecturersNew.size() > 0) attrs.put("lecturers", lecturersNew); + } + return attrs; } Index: CourseManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseManager.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- CourseManager.java 22 Dec 2006 11:07:20 -0000 1.37 +++ CourseManager.java 14 Jul 2008 10:47:23 -0000 1.38 @@ -223,6 +223,14 @@ public List getCourseModuleSubProgramRel(CourseModule cm) throws CobricksException; + // New course modules from prerequisites (20.06.08) + public List getCourseModulePrerequisites(int cmid) + throws CobricksException; + public List getCourseModulePrerequisites(CourseModule cm) + throws CobricksException; + public List getPrerequisitesForCourseModule(String cmid) + throws CobricksException; + /** * This method is used to get a room out of the backend structure. * In case caching is activated, at first a lookup in the cache is performed. @@ -546,6 +554,14 @@ * @param cid * @return */ + + public List getLecturersForCourseModule(int cmid); + + /** + * @param cid + * @return + */ + public String getGroupForCourse(int cid); /** @@ -563,9 +579,14 @@ */ public void addLecturerToCourse(int lid, int cid, User user) throws CobricksException; + + public void addLecturerToCourseModule(int lid, int cmid, User user) + throws CobricksException; public void deleteLecturersFromCourse(int cid, User user); + public void deleteLecturersFromCourseModule(int cmid, User user); + public CourseProgram getProgramForLabel(String cplabel); public void addProgramToModule(Map attrs); Index: CourseManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseManagerImpl.java,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- CourseManagerImpl.java 20 May 2008 14:07:34 -0000 1.72 +++ CourseManagerImpl.java 14 Jul 2008 10:47:23 -0000 1.73 @@ -908,6 +908,25 @@ // add new attributes sqlAttrs.put("cmimport", new Integer(0)); + copyAttr("cmniveau", attrs, sqlAttrs); + copyAttr("cmworkload1", attrs, sqlAttrs); + copyAttr("cmworkload2", attrs, sqlAttrs); + copyAttr("cmpruefungsart", attrs, sqlAttrs); + copyAttr("cmpruefungsdauer", attrs, sqlAttrs); + copyAttr("cmhausaufgaben", attrs, sqlAttrs); + copyAttr("cmhausarbeit", attrs, sqlAttrs); + copyAttr("cmvortrag", attrs, sqlAttrs); + copyAttr("cmgespraech", attrs, sqlAttrs); + copyAttr("cmwdhauchfolgesem", attrs, sqlAttrs); + copyAttr("cmwdhauchsemende", attrs, sqlAttrs); + copyAttr("cmmedia", attrs, sqlAttrs); + copyAttr("cmliterature", attrs, sqlAttrs); + copyAttr("cmsubjectarea", attrs, sqlAttrs); + copyAttr("cmareadipl", attrs, sqlAttrs); + copyAttr("cmprereqcomment", attrs, sqlAttrs); + copyAttr("cmprereqcomment_en", attrs, sqlAttrs); + + int maxcnt = 6; if((Integer)attrs.get("cmprogcnt") != null) { try{ @@ -964,6 +983,81 @@ dbAccess.sqlInsert("course_subprogrel", sqlAttrs2); } } + + // Course module prerequisites from db table (woerndl, 20.06.08) + int cmprid = cmid; + dbAccess.sqlDelete("course_modprerequ", "cmprid = "+cmprid); + for(int i=1; i<=4; i++ ) + { + Map sqlAttrs2 = new HashMap(); + + if( attrs.get("cmprrequ"+i) != null && + attrs.get("cmprrequ"+i).toString() != "") + { + sqlAttrs2.put("cmprid", new Integer(cmprid)); + + Object o = attrs.get("cmprrequ"+i); + if (o != null) sqlAttrs2.put("cmprrequ", o); + + o = attrs.get("cmprlevel"+i); + if (o != null) sqlAttrs2.put("cmprlevel", o); + + dbAccess.sqlInsert("course_modprerequ", sqlAttrs2); + } + } + + // Adding new lecturer to course module (woerndl, 05.06.08) + // deleting all course to lecturers relations + deleteLecturersFromCourseModule(cmid,user); + // Updating course to lecturers relations + try + { + List tmpL = (List) attrs.get("lecturers"); + if(tmpL != null) + { + Iterator iter = tmpL.iterator(); + Integer element = null; + while( iter.hasNext()) + { + element = (Integer) iter.next(); + if(element != null) + { + addLecturerToCourseModule(element.intValue(),cmid,user); + } + } + } + } + catch(Exception ex) + { + logger.error("Failed updating course to lecturers relations.", ex); + } + + try + { + if(attrs.containsKey("newlecturerid")) + { + String tmps = (String) attrs.get("newlecturerid"); + try + { + int lid = Integer.parseInt(tmps); + addLecturerToCourseModule(lid, cmid, user); + } catch (Exception e) { } + } + if(attrs.containsKey("newlecturername")) + { + String lname = (String) attrs.get("newlecturername"); + int lid = getLecturerIdByName(lname); + if (lid > 0) + { + addLecturerToCourseModule(lid, cmid, user); + } + } + } + catch(Exception ex) + { + logger.error("Failed adding course module to lecturer relation.", ex); + } + } catch (Exception e) { logger.error("Failed inserting course module.", e); @@ -981,6 +1075,8 @@ public void updateCourseModule(int cmid, Map attrs, User user) throws CobricksException { + logger.debug("Entering updateCourseModule ..."); + // copy attributes Map sqlAttrs = new HashMap(); copyAttr("cmname", attrs, sqlAttrs); @@ -1010,7 +1106,25 @@ copyAttr("cmhours_lec", attrs, sqlAttrs); copyAttr("cmhours_ex", attrs, sqlAttrs); copyAttr("cmhours_sem", attrs, sqlAttrs); - copyAttr("cmhours_lab", attrs, sqlAttrs); + copyAttr("cmhours_lab", attrs, sqlAttrs); + + copyAttr("cmniveau", attrs, sqlAttrs); + copyAttr("cmworkload1", attrs, sqlAttrs); + copyAttr("cmworkload2", attrs, sqlAttrs); + copyAttr("cmpruefungsart", attrs, sqlAttrs); + copyAttr("cmpruefungsdauer", attrs, sqlAttrs); + copyAttr("cmhausaufgaben", attrs, sqlAttrs); + copyAttr("cmhausarbeit", attrs, sqlAttrs); + copyAttr("cmvortrag", attrs, sqlAttrs); + copyAttr("cmgespraech", attrs, sqlAttrs); + copyAttr("cmwdhauchfolgesem", attrs, sqlAttrs); + copyAttr("cmwdhauchsemende", attrs, sqlAttrs); + copyAttr("cmmedia", attrs, sqlAttrs); + copyAttr("cmliterature", attrs, sqlAttrs); + copyAttr("cmsubjectarea", attrs, sqlAttrs); + copyAttr("cmareadipl", attrs, sqlAttrs); + copyAttr("cmprereqcomment", attrs, sqlAttrs); + copyAttr("cmprereqcomment_en", attrs, sqlAttrs); int maxcnt = 6; if((Integer)attrs.get("cmprogcnt") != null) { @@ -1025,14 +1139,17 @@ } catch(Exception ex) {} } - try { + try + { dbAccess.sqlUpdate("course_module", sqlAttrs, cmid); // Removes all the relation before adding the new relation dbAccess.sqlDelete("course_progrel", "cmid = "+cmid); - for(int i=1; i<=maxcnt; i++ ){ + for(int i=1; i<=maxcnt; i++ ) + { Map sqlAttrs2 = new HashMap(); - if( attrs.get("cpid"+i) != null && attrs.get("cpid"+i).toString() != "") { + if( attrs.get("cpid"+i) != null && attrs.get("cpid"+i).toString() != "") + { sqlAttrs2.put("cmid", new Integer(cmid)); Object o = attrs.get("cpid"+i); if (o != null) sqlAttrs2.put("cpid", o); @@ -1052,10 +1169,12 @@ // Removes all the relation before adding the new relation dbAccess.sqlDelete("course_subprogrel", "cmid = "+cmid); - for(int i=1; i<=maxcnt2; i++ ){ + for(int i=1; i<=maxcnt2; i++ ) + { Map sqlAttrs2 = new HashMap(); if( attrs.get("cspid"+i) != null && - attrs.get("cspid"+i).toString() != "") { + attrs.get("cspid"+i).toString() != "") + { sqlAttrs2.put("cmid", new Integer(cmid)); Object o = attrs.get("cspid"+i); if (o != null) sqlAttrs2.put("cspid", o); @@ -1068,14 +1187,98 @@ dbAccess.sqlInsert("course_subprogrel", sqlAttrs2); } } + + logger.debug("updateCourseModule - 1 -"); + // Course module prerequisites from db table (woerndl, 20.06.08) + int cmprid = cmid; + dbAccess.sqlDelete("course_modprerequ", "cmprid = "+cmprid); + for(int i=1; i<=4; i++ ) + { + logger.debug("updateCourseModule - 2 -"); + Map sqlAttrs2 = new HashMap(); + + logger.debug("attrs = " + attrs); + if( attrs.get("cmprrequ"+i) != null && + attrs.get("cmprrequ"+i).toString() != "") + { + sqlAttrs2.put("cmprid", new Integer(cmprid)); + + Object o = attrs.get("cmprrequ"+i); + if (o != null) sqlAttrs2.put("cmprrequ", o); + + o = attrs.get("cmprlevel"+i); + if (o != null) sqlAttrs2.put("cmprlevel", o); + + dbAccess.sqlInsert("course_modprerequ", sqlAttrs2); + + logger.debug("updateCourseModule - 3 -"); + } + } + + // Adding new lecturer to course module (woerndl, 05.06.08) + // deleting all course to lecturers realations + deleteLecturersFromCourseModule(cmid,user); + // Updating course to lecturers relations + try + { + List tmpL = (List) attrs.get("lecturers"); + if(tmpL != null) + { + Iterator iter = tmpL.iterator(); + Integer element = null; + while( iter.hasNext()) + { + element = (Integer) iter.next(); + if(element != null) + { + addLecturerToCourseModule(element.intValue(),cmid,user); + } + } + } + } + catch(Exception ex) + { + logger.error("Failed updating course to lecturers relations.", ex); + } - } catch (Exception e) { + try + { + if(attrs.containsKey("newlecturerid")) + { + String tmps = (String) attrs.get("newlecturerid"); + try + { + int lid = Integer.parseInt(tmps); + addLecturerToCourseModule(lid, cmid, user); + } catch (Exception e) { } + } + if(attrs.containsKey("newlecturername")) + { + String lname = (String) attrs.get("newlecturername"); + int lid = getLecturerIdByName(lname); + if (lid > 0) + { + addLecturerToCourseModule(lid, cmid, user); + } + } + } + catch(Exception ex) + { + logger.error("Failed adding course module to lecturer relation.", ex); + } + + } + catch (Exception e) + { logger.error("Failed updating course module.", e); } // update cache courseModuleCache.remove(new Integer(cmid)); courseModuleCache.put(new Integer(cmid), getCourseModule(cmid)); + + logger.debug("Leaving updateCourseModule ..."); + } /** @@ -1106,6 +1309,12 @@ dbAccess.sqlDelete("course_progrel", "cmid = "+cmid); dbAccess.sqlDelete("course_subprogrel", "cmid = "+cmid); + dbAccess.sqlDelete("course_lecturermod", "cmid = "+cmid); + + // Remove all prerequisites (woerndl, 20.06.08) + int cmprid = cmid; + dbAccess.sqlDelete("course_modprerequ", "cmprid = "+cmprid); + // update cache courseModuleCache.remove(new Integer(cmid)); } catch (Exception e) { @@ -1735,7 +1944,59 @@ return result; } - + // Course module prerequisites from db table (woerndl, 20.06.08) + public List getCourseModulePrerequisites(int cmid) + throws CobricksException + { + List result = new ArrayList(); + int cmprid = cmid; + String sql = "select * from course_modprerequ where cmprid = "+cmprid+";"; + List sqlList = dbAccess.sqlQuery(sql); + ListIterator i = sqlList.listIterator(); + logger.info("Returns CourseModulePreRequsuites"); + while (i.hasNext()) { + Map m = (Map)i.next(); + CourseModulePrerequisuites cmpr = new CourseModulePrerequisuites(); + cmpr.loadFromMap(m, this); + result.add(cmpr); + } + return result; + } + + // Course module prerequisites from db table (woerndl, 20.06.08) + public List getCourseModulePrerequisites(CourseModule cm) + throws CobricksException + { + logger.debug("Entering getCourseModulePrerequisites ..."); + int cmprid = cm.getId(); + List result = new ArrayList(); + String sql = "select * from course_modprerequ where cmprid = "+cmprid+";"; + List sqlList = dbAccess.sqlQuery(sql); + ListIterator i = sqlList.listIterator(); + logger.info("Returns CourseModulePreRequisuites"); + while (i.hasNext()) + { + logger.debug("Entering CourseModulePreRequisuites loop ... "); + Map m = (Map)i.next(); + CourseModulePrerequisuites cmpr = new CourseModulePrerequisuites(); + cmpr.loadFromMap(m, this, cm); + result.add(cmpr); + logger.debug("getCourseModulePrerequisites: cmpr = " + cmpr.getModuleId()); + } + return result; + } + + // Course module prerequisites from db table (woerndl, 20.06.08) + public List getPrerequisitesForCourseModule(String cmid) + throws CobricksException + { + logger.debug("getPrerequisitesForCourseModule("+cmid+")"); + int cmidint = Integer.valueOf(cmid).intValue(); + List result=getCourseModulePrerequisites(cmidint); + return result; + } + + /** * @see org.cobricks.course.CourseManager#getCourseModuleSubProgramRel(int) */ @@ -2032,6 +2293,22 @@ } /** + * @see org.cobricks.course.CourseManager#deleteLecturerToCourse(int, int, org.cobricks.user.User) + */ + public void deleteLecturersFromCourseModule(int cmid, User user) + { + try { + logger.debug("deleteLecturersFromCourseModule("+cmid+","+user+")"); + String sql = "delete from course_lecturermod " + +"where cmid = "+Integer.toString(cmid); + dbAccess.sqlExecute(sql); + } catch (Exception e) { + logger.error("Failed deleting lecturer from course module: "+e.toString()); + } + } + + + /** * @see org.cobricks.course.CourseManager#insertLecturerToCourse(int, int, org.cobricks.user.User) */ public void addLecturerToCourse(int lid, int cid, User user) @@ -2053,6 +2330,30 @@ "to course : "+e.toString()); } } + + /** + * @see org.cobricks.course.CourseManager#insertLecturerToCourse(int, int, org.cobricks.user.User) + */ + public void addLecturerToCourseModule(int lid, int cmid, User user) + throws CobricksException { + try { + logger.debug("addLecturerToCourseModule("+lid+","+cmid+")"); + String sql = "DELETE FROM course_lecturermod " + +"WHERE cmid = "+Integer.toString(cmid)+" " + + "AND lid = "+Integer.toString(lid); + + dbAccess.sqlExecute(sql); + + sql = "INSERT INTO course_lecturermod " + +"(lid,cmid) VALUES ("+Integer.toString(lid)+ + ","+Integer.toString(cmid)+")"; + dbAccess.sqlExecute(sql); + } catch (Exception e) { + logger.error("Failed inserting lecturer " + + "to course module : "+e.toString()); + } + } + /** * @see org.cobricks.course.CourseManager#getCoursesForLecturer(int) @@ -2109,7 +2410,35 @@ } return result; } - + + /** + * @see org.cobricks.course.CourseManager#getLecturersForCourse(int) + */ + public List getLecturersForCourseModule(int cmid) + { + logger.debug("getLecturersForCourseModule("+cmid+")"); + String sql = "select course_lecturer.lid " + +"from course_lecturer, course_lecturermod " + +"where cmid = "+cmid+" and " + +"course_lecturer.lid = course_lecturermod.lid " + +"order by course_lecturer.ltyp desc, llastname"; + List sqlresult = dbAccess.sqlQuery(sql); + List result = new ArrayList(); + Iterator i = sqlresult.listIterator(); + while (i.hasNext()) { + Map m = (Map)i.next(); + Integer lid = (Integer)m.get("lid"); + if (lid != null) { + try { + CourseLecturer l = getLecturer(lid.intValue()); + result.add(l); + } catch (Exception e) { + logger.error("Failed getting lecturer ...", e); + } + } + } + return result; + } /** * @see org.cobricks.course.CourseManager#getGroupForCourse(int) Index: CourseLecturer.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseLecturer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CourseLecturer.java 15 Dec 2006 23:06:32 -0000 1.11 +++ CourseLecturer.java 14 Jul 2008 10:47:23 -0000 1.12 @@ -13,6 +13,7 @@ import java.util.Map; +import java.text.*; import org.apache.log4j.Logger; @@ -58,6 +59,12 @@ { return lid; } + + public String getId3() + { + DecimalFormat df = new DecimalFormat ( "000" ); + return df.format(lid); + } public String getName() { Index: CourseModule.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseModule.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- CourseModule.java 21 Mar 2007 08:25:38 -0000 1.7 +++ CourseModule.java 14 Jul 2008 10:47:23 -0000 1.8 @@ -37,6 +37,7 @@ int cmid; List cmprogramrel; List cmsprogramrel; + List cmprereq; // Prerequisities in separate db table (woerndl) Map attrs; @@ -258,6 +259,129 @@ if (i == null) return 0; return i.intValue(); } + + // New + public String getNiveau() + { + return (String)attrs.get("cmniveau"); + } + + public String getWorkload1() + { + return (String)attrs.get("cmworkload1"); + } + + public String getWorkload2() + { + return (String)attrs.get("cmworkload2"); + } + + public int getWorkload3() + { + return (getHours() * 14); + } + + public Float getWorkload4() + { + try { + Object o = attrs.get("cmectscredits"); + if (o == null) return null; + if (!(o instanceof Float)) { + try { + o = new Float(o.toString()); + } catch (Exception e) { + logger.error("cmectscredits not valid: "+o.toString()); + return null; + } + } + float f = (int) ((java.lang.Float)o).floatValue(); + f = f * (float)30; + return new Float(f); + } catch (Exception e) { + logger.error(LogUtil.ex("exception", e)); + } + return new Float(0.0); + } + + public String getPruefungsart() + { + return (String)attrs.get("cmpruefungsart"); + } + + public String getPruefungsdauer() + { + return (String)attrs.get("cmpruefungsdauer"); + } + + public String getHausaufgaben() + { + return (String)attrs.get("cmhausaufgaben"); + } + + public String getHausarbeit() + { + return (String)attrs.get("cmhausarbeit"); + } + + public String getVortrag() + { + return (String)attrs.get("cmvortrag"); + } + + public String getGespraech() + { + return (String)attrs.get("cmgespraech"); + } + + public String getWdhauchfolgesem() + { + return (String)attrs.get("cmwdhauchfolgesem"); + } + + public String getWdhauchsemende() + { + return (String)attrs.get("cmwdhauchsemende"); + } + + public String getMedia() + { + return (String)attrs.get("cmmedia"); + } + + public String getLiterature() + { + return (String)attrs.get("cmliterature"); + } + + public String getSubjectarea() + { + return (String)attrs.get("cmsubjectarea"); + } + + + public String getAreadipl() + { + return (String)attrs.get("cmareadipl"); + } + + public String getPrereqcomment(String lang) + { + if (lang.equals("en")) + return (String)attrs.get("cmprereqcomment_en"); + return (String)attrs.get("cmprereqcomment"); + } + + public String getPrereqcomment_de() + { + return (String)attrs.get("cmprereqcomment"); + } + + public String getPrereqcomment_en() + { + return (String)attrs.get("cmprereqcomment_en"); + } + + /** * @return Returns the cmprogramrel. @@ -275,12 +399,20 @@ return cmsprogramrel; } + public List getPreRequisites() + { + logger.debug("getPreRequisites"); + logger.debug("cmprereq = " + cmprereq.toString()); + return cmprereq; + } + /** * Load course attributes from a Map object - e.g. one retrieved * from a database */ public void loadFromMap(Map map, CourseManager courseManager) { + logger.debug("CourseModule.loadFromMap 1"); Integer tmpi = (Integer)map.get("cmid"); if (tmpi == null) { logger.error("cmid attribute is null - this should not happen"); @@ -288,18 +420,27 @@ } cmid = tmpi.intValue(); attrs = new HashMap(map); + logger.debug("CourseModule.loadFromMap 2"); try { cmprogramrel = courseManager.getCourseModuleProgramRel(this); } catch (Exception e) { logger.error(LogUtil.ex("Failed loading course template.", e)); } + logger.debug("CourseModule.loadFromMap 3"); try { cmsprogramrel = courseManager.getCourseModuleSubProgramRel(this); } catch (Exception e) { logger.error(LogUtil.ex("Failed loading course template.", e)); } + logger.debug("CourseModule.loadFromMap 4"); + try { + cmprereq = + courseManager.getCourseModulePrerequisites(this); + } catch (Exception e) { + logger.error(LogUtil.ex("Failed loading course template.", e)); + } } } |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:47:29
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16761/web/ADMIN/org.cobricks.core Modified Files: comm.html.en db.html.en index.html.en scheduler.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 7 Dec 2006 13:29:22 -0000 1.1 +++ index.html.en 14 Jul 2008 10:47:24 -0000 1.2 @@ -1,23 +1,22 @@ -#parse ( "/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.core/index.html">Core Component</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/index.html">Core Component</a></em> <h1>Core Component</h1> -<h3><a href="properties.html">Properties</a></h3> +<h3><a href="$contextPath/ADMIN/org.cobricks.core/properties.html">Properties</a></h3> -<h3><a href="db.html">Database Access</a></h3> +<h3><a href="$contextPath/ADMIN/org.cobricks.core/db.html">Database Access</a></h3> <p>Database Version: $coreManager.getDBAccess().getDBInfo()<br> Database URI: ${coreManager.getProperty("db.jdbc.uri")}</p> -<h3><a href="scheduler.html">Scheduler</a></h3> - -<h3><a href="comm.html">Component Communication</a></h3> +<h3><a href="$contextPath/ADMIN/org.cobricks.core/scheduler.html">Scheduler</a></h3> +<h3><a href="$contextPath/ADMIN/org.cobricks.core/comm.html">Component Communication</a></h3> -#parse ( "/ADMIN/pagefooter.html" ) +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) Index: db.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core/db.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db.html.en 7 Dec 2006 13:29:22 -0000 1.1 +++ db.html.en 14 Jul 2008 10:47:24 -0000 1.2 @@ -1,9 +1,9 @@ -#parse ( "/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - -<a href="/ADMIN/org.cobricks.core/db.html">Database Access</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/index.html">Core Component</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/db.html">Database Access</a></em> <h1>Database Access</h1> @@ -18,19 +18,31 @@ <p> -<p>TBD: show schema ... +<p>Tables:<br> +#set ( $l = $coreManager.getDBAccess().getTables()) +#set ( $flag = 0 ) +#foreach ($tname in $l) +#if ( $flag == 1 ) +, +#end +<a href="db-schema.html?tname=$tname">$tname</a> +#set ($flag = 1) +#end + +<p> #set ( $cmd = "$!cmd" ) #if ($cmd == "dbquerydoit") <p><b>Results of query "$sqlquery":</b><br> -#foreach ($row in $coreManager.getDBAccess().sqlQuery($sqlquery)) +#foreach ($row in $corePresenter.sqlQuery($sqlquery)) $corePresenter.formatDBRow($row)<br> #end #end #if ($cmd == "dbupdatedoit") <p><b>Performing update "$sqlquery"</b><br> -$coreManager.getDBAccess().sqlExecute($sqlquery) +#set ($res = $!corePresenter.sqlExecute("$!sqlquery")) +<div class="error">$!res</div> #end <p> @@ -51,5 +63,4 @@ <input type="submit" name="submit" value="Perform Update"> </form> - -#parse ( "/ADMIN/pagefooter.html" ) +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) Index: scheduler.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core/scheduler.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- scheduler.html.en 7 Dec 2006 13:29:23 -0000 1.1 +++ scheduler.html.en 14 Jul 2008 10:47:24 -0000 1.2 @@ -1,16 +1,50 @@ -#parse ( "/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - -<a href="/ADMIN/org.cobricks.core/scheduler.html">Scheduler</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/index.html">Core Component</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/scheduler.html">Scheduler</a></em> <h1>Scheduler</h1> -TBD +#set ( $sh = $coreManager.getSchedulerHandler() ) +#if ("$!startTask"!="") +#set ( $tmps = $sh.startThread("$startTask") ) +<p><div class="success">Task $!startTask started.</div></p> +#end +<p>The scheduler has to configured by editing / extending the platform +properties, e.g. +<pre> + scheduler.task.X.time=cron:*,*,*,*,* + scheduler.task.X.class=org.cobricks.item.RSSImportTask + scheduler.task.X.args=argument1,argument2 +</pre> +</p> -#parse ( "/ADMIN/pagefooter.html" ) +<p>In the following we show all property entries beginning +with 'scheduler.':</p> +<table border="0"> +#foreach( $i in $corePresenter.getSortedPropertyNames("scheduler.") ) +<tr><td><em>$i</em></td><td> </td><td>$coreManager.getProperty($i)</td> +</tr> +#end +</table> + +<p>To explicitly start sheduled tasks press the button for the +required task.</p> + +<ul> +#foreach ( $id in $sh.getScheduleIds() ) +<li><b>$id</b> - <a href="scheduler.html?startTask=$id">start task</a><br> + $sh.getSchedule($id)<br> + $sh.getScheduleClass($id)<br> + $sh.getScheduleArgs($id) +#end +</ul> + + +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) Index: comm.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.core/comm.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- comm.html.en 7 Dec 2006 13:29:21 -0000 1.1 +++ comm.html.en 14 Jul 2008 10:47:24 -0000 1.2 @@ -1,9 +1,9 @@ -#parse ( "/ADMIN/pageheader.html" ) +$portalPresenter.parse("/ADMIN/pageheader.html",$portalRequest) -<em><a href="/ADMIN/index.html">Admin</a> - -<a href="/ADMIN/org.cobricks.core/index.html">Core Component</a> - -<a href="/ADMIN/org.cobricks.core/comm.html">Component Communication</a></em> +<em><a href="$contextPath/ADMIN/index.html">Admin</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/index.html">Core Component</a> - +<a href="$contextPath/ADMIN/org.cobricks.core/comm.html">Component Communication</a></em> <h1>Component Communication</h1> @@ -24,8 +24,4 @@ #end -#parse ( "/ADMIN/pagefooter.html" ) - - - - +$portalPresenter.parse("/ADMIN/pagefooter.html",$portalRequest) |
|
From: Wolfgang W. <wo...@us...> - 2008-07-14 10:47:28
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16761/src/org/cobricks/course/db Modified Files: course_module.xml tables.txt Log Message: Index: tables.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/tables.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- tables.txt 8 Dec 2006 16:22:41 -0000 1.4 +++ tables.txt 14 Jul 2008 10:47:24 -0000 1.5 @@ -1,3 +1,5 @@ +course_modprerequ +course_lecturermod course_date course_lecturerrel course_lecturer Index: course_module.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course_module.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- course_module.xml 24 Nov 2006 08:05:56 -0000 1.4 +++ course_module.xml 14 Jul 2008 10:47:24 -0000 1.5 @@ -33,13 +33,45 @@ <!-- 0=confirmed/show, 1=archived/hidden, 2=not confirmed/hidden --> <column name="cmcycle" type="varchar(10)"/> - <column name="cmlang" type="char(2)"/> <column name="cmcapacity" type="int"/> <column name="cmresponsible" type="int"/> <!-- reference to lecturer --> <column name="cmcomment" type="text"/> <column name="cmaddxml" type="text"/> + + <!-- added 09062008 --> + <column name="cmniveau" type="varchar(30)"/> + <!-- "BSc", "MSc", "3jahr" --> + <column name="cmlang" type="varchar(30)"/> + <!-- "Deutsch", "English", "DoderE" --> + <column name="cmworkload" type="varchar(30)"/> + + <column name="cmpruefungsart" type="varchar(70)"/> + <!-- "s", "m", "sm" --> + <column name="cmpruefungsdauer" type="varchar(30)"/> + <column name="cmhausaufgaben" type="varchar(30)"/> + <!-- "ja", "nein" --> + <column name="cmhausarbeit" type="varchar(30)"/> + <!-- "ja", "nein" --> + <column name="cmvortrag" type="varchar(30)"/> + <!-- "ja", "nein" --> + <column name="cmgespraech" type="varchar(30)"/> + <!-- "ja", "nein" --> + <column name="cmwdhauchfolgesem" type="varchar(30)"/> + <!-- "ja", "nein" --> + <column name="cmwdhauchsemende" type="varchar(30)"/> + <!-- "ja", "nein" --> + + <column name="cmmedia" type="text"/> + <column name="cmliterature" type="text"/> + <column name="cmsubjectarea" type="varchar(30)"/> + <!-- "SE", "DBI", "KIR", "CGBV", "RA", "VRN", "FMA", "AWR" --> + + <column name="cmareadipl" type="varchar(30)"/> + + <column name="cmprereqcomment" type="text"/> + <column name="cmprereqcomment_en" type="text"/> <index name="coursemodule_cmid" unique="unique"> <colname>cmid</colname> |
|
From: Wolfgang W. <wo...@us...> - 2008-05-20 14:07:38
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15717/src/org/cobricks/course/db Modified Files: course.xml Log Message: Index: course.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/db/course.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- course.xml 20 Jun 2007 15:11:42 -0000 1.7 +++ course.xml 20 May 2008 14:07:34 -0000 1.8 @@ -51,6 +51,8 @@ <column name="cexamweek" type="varchar(25)"/> <column name="cexamrepeatweek" type="varchar(25)"/> + <column name="craumausstatt" type="varchar(255)"/> + <index name="course_cid" unique="unique"> <colname>cid</colname> </index> |
|
From: Wolfgang W. <wo...@us...> - 2008-05-20 14:07:38
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15717/src/org/cobricks/course Modified Files: Course.java CourseManagerImpl.java CourseServlet.java Log Message: Index: Course.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/Course.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Course.java 20 Jun 2007 15:11:42 -0000 1.29 +++ Course.java 20 May 2008 14:07:34 -0000 1.30 @@ -225,6 +225,15 @@ return null; } + /** Returns the field Raumausstattung + * @return String representing the input of the lecturer + */ + public String getRaumausstatt() + { + return (String)attrs.get("craumausstatt"); + } + + /** Returns the course examform * @return String representing the type of exam of the course (e.g. muendl) */ Index: CourseServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseServlet.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- CourseServlet.java 20 Jun 2007 15:11:42 -0000 1.31 +++ CourseServlet.java 20 May 2008 14:07:34 -0000 1.32 @@ -147,6 +147,8 @@ attrs.put("cexamweek", prequest.getRequestParameter("cexamweek")); attrs.put("cexamrepeatweek", prequest.getRequestParameter("cexamrepeatweek")); + attrs.put("craumausstatt", prequest.getRequestParameter("craumausstatt")); + tmps = prequest.getRequestParameter("ccapacity"); if (tmps != null) { try { Index: CourseManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseManagerImpl.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- CourseManagerImpl.java 20 Jun 2007 15:11:42 -0000 1.71 +++ CourseManagerImpl.java 20 May 2008 14:07:34 -0000 1.72 @@ -213,6 +213,8 @@ copyAttr("cexamweek", attrs, sqlAttrs); copyAttr("cexamrepeatweek", attrs, sqlAttrs); + copyAttr("craumausstatt", attrs, sqlAttrs); + try { if (user != null) sqlAttrs.put("clastupdateuserid", new Integer(user.getId())); @@ -377,6 +379,7 @@ copyAttr("cexamweek", attrs, sqlAttrs); copyAttr("cexamrepeatweek", attrs, sqlAttrs); + copyAttr("craumausstatt", attrs, sqlAttrs); try { sqlAttrs.put("clastupdateuserid", new Integer(user.getId())); |
|
From: Wolfgang W. <wo...@us...> - 2008-05-20 14:07:13
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15349/src/de/tum/cobricks/course Modified Files: generateHTMLOverviews.java generateListExams.java Log Message: Index: generateHTMLOverviews.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateHTMLOverviews.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- generateHTMLOverviews.java 23 Feb 2007 09:52:32 -0000 1.11 +++ generateHTMLOverviews.java 20 May 2008 14:07:05 -0000 1.12 @@ -66,7 +66,7 @@ { String confdir = "WEB-INF/conf"; querysem = "SS"; - queryjahr = 2007; + queryjahr = 2008; if (args.length > 0) confdir = args[0]; if (args.length > 1) @@ -141,10 +141,15 @@ { String filename = "vv" + querysem; String year = Integer.toString(queryjahr); - if (querysem.equals("SS") && year.length() > 2) + + // Mail Manfred: Dateiname soll immer "2008" enthalten, nicht nur 08 +/* if (querysem.equals("SS") && year.length() > 2) filename += year.substring(2,4); // Example SS 2007 -> file name with 07 only else filename += year; + */ + + filename += year; try { makeInformatik(new File(filename+"-info.html")); @@ -260,13 +265,11 @@ out.println(ke); } - /* out.println("<P><a name=\"bsi-sem\"></a><h3>Seminare</h3>"); tmpi = getData(out, "BS-INF", "Seminar", ""); if (tmpi < 1) { out.println(ke); } - */ out.println("<P><a name=\"bsi-prakt\"></a><h3>Praktika</h3>"); tmpi = getData(out, "BS-INF", "Praktikum", ""); Index: generateListExams.java =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course/generateListExams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- generateListExams.java 17 Jul 2007 12:44:58 -0000 1.1 +++ generateListExams.java 20 May 2008 14:07:05 -0000 1.2 @@ -205,6 +205,9 @@ out.print("; cexamweek=" + c.getExamweek()); out.print("; cexamrepeatweek=" + c.getExamrepeatweek()); + // New + out.print("; craumausstatt=" + c.getRaumausstatt()); + out.println(""); } catch (Exception e) { } |
|
From: Wolfgang W. <wo...@us...> - 2008-05-20 14:07:13
|
Update of /cvsroot/cobricks/drehscheibe-in In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15349 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- build.xml 17 Jul 2007 12:44:57 -0000 1.13 +++ build.xml 20 May 2008 14:07:05 -0000 1.14 @@ -403,7 +403,7 @@ classname="de.tum.cobricks.course.generateHTMLOverviews" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2007 test"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008 test"/> </java> </target> @@ -412,7 +412,7 @@ classname="de.tum.cobricks.course.generateListDeputate" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2007"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008"/> </java> </target> @@ -421,7 +421,7 @@ classname="de.tum.cobricks.course.generateListExams" maxmemory="512M" classpathref="exec.classpath"> <jvmarg value="-Dfile.encoding=utf-8"/> - <arg line="build/webapps/ROOT/WEB-INF/conf WS 2007"/> + <arg line="build/webapps/ROOT/WEB-INF/conf SS 2008"/> </java> </target> |
|
From: Wolfgang W. <wo...@us...> - 2007-12-19 15:00:56
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5213/src/org/cobricks/portal Modified Files: PortalManager.java PortalManagerImpl.java PortalPresenter.java Log Message: Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- PortalPresenter.java 14 Nov 2007 14:03:49 -0000 1.63 +++ PortalPresenter.java 19 Dec 2007 15:00:40 -0000 1.64 @@ -239,7 +239,7 @@ } return ""; } - + public String parse(String filename, PortalRequest portalRequest, String defaultfilename) { @@ -260,6 +260,22 @@ } return ""; } + + public String parseURL(String urlname, PortalRequest portalRequest) + { + logger.debug("parseURL("+urlname+")"); + String pageContent = + portalManager.getPageContentURL(urlname, portalRequest); + try { + StringWriter sw = new StringWriter(); + Velocity.evaluate(portalRequest.getVelocityContext(), sw, + "", pageContent); + return sw.toString(); + } catch (Exception e) { + logger.error(LogUtil.ex("Failed parsing URL template.", e)); + } + return ""; + } /** Index: PortalManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManager.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- PortalManager.java 4 Mar 2007 12:49:47 -0000 1.24 +++ PortalManager.java 19 Dec 2007 15:00:40 -0000 1.25 @@ -48,6 +48,8 @@ public PortalObject getObject(String pagePath, String pageName); public PortalObject getObject(int itemid); public String getPageContent(String filename, PortalRequest portalRequest); + public String getPageContentURL(String urlname, PortalRequest portalRequest); + public void saveFileToFilesystem(String pagepath, String pagename, byte barr[]); Index: PortalManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalManagerImpl.java,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- PortalManagerImpl.java 4 Mar 2007 12:49:48 -0000 1.99 +++ PortalManagerImpl.java 19 Dec 2007 15:00:40 -0000 1.100 @@ -315,7 +315,7 @@ pageName = filename; } } - PortalObject o = getObject(pagePath, pageName); + PortalObject o = getObject(pagePath, pageName); if (!(o instanceof PortalPage)) { logger.warn("Wrong type of portal object for " +pagePath+pageName+": "+o.getClass().getName()); @@ -329,6 +329,42 @@ return (String)pc.get(pageLang); } + /** + * Quick&dirty method to read page from a URL, instead of file + */ + public String getPageContentURL(String urlname, PortalRequest portalRequest) + { + String res = ""; + + try + { + URL url = new URL(urlname); + URLConnection urlconnection = url.openConnection(); + InputStream is = urlconnection.getInputStream(); + InputStreamReader isr = new InputStreamReader ( is ); + BufferedReader bufRead = new BufferedReader ( isr ); + + String s = null; + do + { + s = bufRead.readLine(); + if (s != null) + { + res = res + s; + } + } while (s != null); + + bufRead.close(); + isr.close(); + } + catch (Exception e) + { + logger.warn(LogUtil.ex("Failed reading URL template", e)); + } + + return res; + } + /** * Try to load the contents for the given itemid from the database. |