cobricks-cvscommit

[Cobricks-cvscommit] cobricks2/src/org/cobricks/course Course.java CourseManagerImpl.java CourseServlet.java

[Wolfgang W. <wo...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/course
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21017/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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Course.java	21 Mar 2007 08:25:38 -0000	1.28
+++ Course.java	20 Jun 2007 15:11:42 -0000	1.29
@@ -225,6 +225,38 @@
         return null;
     }
     
+    /** Returns the course examform
+     * @return String representing the type of exam of the course (e.g. muendl)
+     */
+    public String getExamform()
+    {
+        return (String)attrs.get("cexamform");
+    }
+    
+    /** Returns the course examrepeat
+     * @return String representing whether Wiederholungsklausur or not
+     */
+    public String getExamrepeat()
+    {
+        return (String)attrs.get("cexamrepeat");
+    }
+    
+    /** Returns the course examweek
+     * @return String representing the week of the exam (e.g. ersteFreieWoche)
+     */
+    public String getExamweek()
+    {
+        return (String)attrs.get("cexamweek");
+    }
+    
+    /** Returns the course examrepeatweek
+     * @return String representing the week of the Wiederholungsklausur (e.g. ersteWocheNeuSem)
+     */
+    public String getExamrepeatweek()
+    {
+        return (String)attrs.get("cexamrepeatweek");
+    }    
+    
     public int getHours()
     {
         int res = getHoursLecture();

Index: CourseServlet.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/course/CourseServlet.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CourseServlet.java	4 Mar 2007 12:49:47 -0000	1.30
+++ CourseServlet.java	20 Jun 2007 15:11:42 -0000	1.31
@@ -141,6 +141,12 @@
         attrs.put("ccomment", prequest.getRequestParameter("ccomment"));
         attrs.put("clang", prequest.getRequestParameter("clang"));
         attrs.put("curl", prequest.getRequestParameter("curl"));
+        
+        attrs.put("cexamform", prequest.getRequestParameter("cexamform"));
+        attrs.put("cexamrepeat", prequest.getRequestParameter("cexamrepeat"));
+        attrs.put("cexamweek", prequest.getRequestParameter("cexamweek"));
+        attrs.put("cexamrepeatweek", prequest.getRequestParameter("cexamrepeatweek"));
+        
         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.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- CourseManagerImpl.java	1 Jun 2007 13:45:24 -0000	1.70
+++ CourseManagerImpl.java	20 Jun 2007 15:11:42 -0000	1.71
@@ -208,6 +208,11 @@
         copyAttr("cextlastrep", attrs, sqlAttrs);
         copyAttr("cimport", attrs, sqlAttrs);
         
+        copyAttr("cexamform", attrs, sqlAttrs);
+        copyAttr("cexamrepeat", attrs, sqlAttrs);
+        copyAttr("cexamweek", attrs, sqlAttrs);
+        copyAttr("cexamrepeatweek", attrs, sqlAttrs);
+        
         try {
             if (user != null)
                 sqlAttrs.put("clastupdateuserid", new Integer(user.getId()));
@@ -366,6 +371,13 @@
         copyAttr("chidden", attrs, sqlAttrs);  
         copyAttr("cextlastrep", attrs, sqlAttrs);              
         copyAttr("ccapacity", attrs, sqlAttrs);              
+        
+        copyAttr("cexamform", attrs, sqlAttrs);
+        copyAttr("cexamrepeat", attrs, sqlAttrs);
+        copyAttr("cexamweek", attrs, sqlAttrs);
+        copyAttr("cexamrepeatweek", attrs, sqlAttrs);
+        
+        
         try {
             sqlAttrs.put("clastupdateuserid", new Integer(user.getId()));
         } catch(Exception exp){
@@ -2643,3 +2655,4 @@
     }
 
 }
+

[Cobricks-cvscommit] cobricks2/src/org/cobricks/course Course.java CourseManagerImpl.java CourseServlet.java

[Wolfgang W. <wo...@us...>]

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()));