Index: lams_gradebook/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/build.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/build.xml	9 Apr 2009 04:55:56 -0000	1.1
+++ lams_gradebook/build.xml	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -5,17 +5,17 @@
 ]>
 <project name="LAMS_Gradebook" default="usage" basedir=".">
 
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
+	<property file="build.properties" />
+	<property file="../lams_build/common.properties" />
 	<property file="../lams_build/${osPropertiesName}.properties" />
 
 	<path id="all-libs">
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${j2eelibs}">
-					<include name="**/*.jar"/>
-			</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${j2eelibs}">
+			<include name="**/*.jar" />
+		</fileset>
 	</path>
 
 	<path id="project.classpath">
@@ -28,8 +28,7 @@
 	<target name="usage">
 		<echo message="" />
 		<echo message="${name} build file" />
-		<echo
-			message="------------------------------------------------------" />
+		<echo message="------------------------------------------------------" />
 		<echo message="" />
 		<echo message="Among the available targets are:" />
 		<echo message="" />
@@ -40,8 +39,7 @@
 	</target>
 
 	<target name="init">
-		<available property="xdoclet-jars-installed"
-			file="lib/xdoclet/xdoclet-${xdoclet.version}.jar" />
+		<available property="xdoclet-jars-installed" file="lib/xdoclet/xdoclet-${xdoclet.version}.jar" />
 	</target>
 
 
@@ -55,19 +53,16 @@
 		<mkdir dir="${build.lib}" />
 	</target>
 
-	<target name="clean" depends="preparedirs"
-		description="removes all class files">
+	<target name="clean" depends="preparedirs" description="removes all class files">
 		<delete>
 			<fileset dir="${build.classes.java}" />
 			<fileset dir="${build.classes.test}" />
 			<fileset dir="${build.lib}" />
 		</delete>
 	</target>
 
-	<target name="compile.java" depends="clean"
-		description="compile java sources">
-		<javac srcdir="${src.java.dir}" compiler="modern"
-			destdir="${build.classes.java}" deprecation="on" debug="on">
+	<target name="compile.java" depends="clean" description="compile java sources">
+		<javac srcdir="${src.java.dir}" compiler="modern" destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
 				<path refid="project.classpath" />
 			</classpath>
@@ -86,23 +81,22 @@
 	<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
 		<copy overwrite="yes" todir="${build.web}">
 			<fileset dir="${conf.web.dir}">
-				<include name="**/*.xml"/>
-				<include name="**/*.tld"/>
+				<include name="**/*.xml" />
+				<include name="**/*.tld" />
 			</fileset>
 		</copy>
 		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams">
-				<fileset dir="${src.java.dir}/org/lamsfoundation/lams">
-						<include name="**/*.xml"/>
-						<include name="**/*.properties"/>
-				</fileset>
-		</copy>	
+			<fileset dir="${src.java.dir}/org/lamsfoundation/lams">
+				<include name="**/*.xml" />
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
 	</target>
 
 	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
 	<!-- =================================================================== -->
-	<target name="fail-if-no-xdoclet-1.2"
-		unless="xdoclet-jars-installed">
+	<target name="fail-if-no-xdoclet-1.2" unless="xdoclet-jars-installed">
 		<fail>
 			You must download several jar files before you can build
 			Middlegen. Execute the "download-deps" target. Then try to
@@ -120,154 +114,114 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-		<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
-			<delete file="${build.lib}/${product}.jar"/>
-			<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/gradebook">
-				<fileset dir="${conf.language.dir}">
-					<include name="**/*.properties"/>
-				</fileset>
-			</copy>
-			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
-				<fileset dir="${build.classes.java}"/>
-				<!--<fileset dir="${conf.hibernate.mapping.dir}"/>-->
-				<fileset dir="${build.web}"/>
-			</jar>
-			<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/gradebook">
-				<fileset dir="${conf.language.dir}">
-					<include name="**/*.properties"/>
-					<include name="**/*.txt"/>
-				</fileset>
-			</copy>
-		</target>
-	
-	   <!-- =================================================================== -->
-	   <!-- Run xdoclet			                                                -->
-	   <!-- =================================================================== -->
-	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-		    <classpath refid="all-libs"/>
-		</taskdef>
-		
-		<target name="webdoclet" depends="preparedirs">
-			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+	<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
+		<delete file="${build.lib}/${product}.jar" />
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
+		<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+			<fileset dir="${build.classes.java}" />
+			<!--<fileset dir="${conf.hibernate.mapping.dir}"/>-->
+			<fileset dir="${build.web}" />
+		</jar>
+		<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+		</copy>
+	</target>
 
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
+	<!-- =================================================================== -->
+	<!-- Run xdoclet			                                                -->
+	<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		<classpath refid="all-libs" />
+	</taskdef>
 
-	         <deploymentdescriptor servletspec="2.4" distributable="false"
-	         	destdir="${conf.webinf.dir}"
-				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
-				
-	         <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
-	         <strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
-	      </webdoclet>
-	   </target>
-	
-	   <!-- ================================================ -->
-	   <!-- Make the WAR archive for deployment				 -->
-	   <!-- ================================================ -->	
-		
-	   <target name="build-war" depends="webdoclet,build-jar" description="creates war file">
-	   		<delete file="${build.lib}/${product}.war"/>	
-	   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
-	   			 webxml="${conf.webinf.dir}/web.xml">
-	   			
-	   			<webinf dir="${conf.webinf.dir}">
-	   				<include name=".xml"/>
-	   				<include name="**/*.*"/>
-	   				<exclude name="web.xml"/>
-	   				<exclude name="classes/**"/>
-	   			</webinf>
-	   			<classes dir="${build.classes.java}"/>	
-	   			<!-- front end programs like HTML, JSP, CSS etc. -->
-	   			<fileset dir="${conf.web.dir}">
-						<include name="**/*.jsp"/>
-						<include name="file/*.xls"/>
-	   					<include name="file/*.sql"/>
-				</fileset>
-	   			
-	   	   </war>
-	   	
-	   </target>
-	
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
-			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
-				<fileset dir="${tag.web.dir}/tags">
-					<include name="*.tag" />
-				</fileset>
-			</copy>
-	   </target>
-	
+	<target name="webdoclet" depends="preparedirs">
+		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+
+			<fileset dir="${src.java.dir}">
+				<include name="**/*Action.java" />
+				<include name="**/*Form.java" />
+			</fileset>
+
+			<deploymentdescriptor servletspec="2.4" distributable="false" destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}" />
+
+			<strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
+			<strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3" />
+		</webdoclet>
+	</target>
+
+	<!-- ================================================ -->
+	<!-- Make the WAR archive for deployment				 -->
+	<!-- ================================================ -->
+
+	<target name="build-war" depends="webdoclet" description="creates war file">
+		<delete file="${build.lib}/${product}.war" />
+		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF" webxml="${conf.webinf.dir}/web.xml">
+
+			<webinf dir="${conf.webinf.dir}">
+				<include name=".xml" />
+				<include name="**/*.*" />
+				<exclude name="web.xml" />
+				<exclude name="classes/**" />
+			</webinf>
+			<classes dir="${build.classes.java}" />
+			<!-- front end programs like HTML, JSP, CSS etc. -->
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.jsp" />
+				<include name="file/*.xls" />
+				<include name="file/*.sql" />
+			</fileset>
+
+		</war>
+
+	</target>
+
+	<target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />
+		<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+			<fileset dir="${tag.web.dir}/tags">
+				<include name="*.tag" />
+			</fileset>
+		</copy>
+	</target>
+
 	<!-- =================================================================== -->
 	<!-- Deploy the jar and war                               -->
 	<!-- =================================================================== -->
-	<target name="deploy-war" depends="build-war" description="Deploy the Gradebook war file and jar file">
+	<target name="deploy-war" depends="build-war" description="Deploy the Gradebook war file">
 		<delete quiet="true">
-			<fileset dir="${jboss.deploy}/tmp"/>
-			<fileset dir="${jboss.deploy}/work"/>
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
 		</delete>
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/> 
-		<copy file="${build.lib}/${product}.war"
-				todir="${jboss.deploy}"/> 
+		<copy file="${build.lib}/${product}.war" todir="${jboss.deploy}" />
 	</target>
-	
+
 	<!-- =================================================================== -->
 	<!-- Deploy the jar                         -->
 	<!-- =================================================================== -->
 	<target name="deploy-jar" depends="build-jar" description="Deploy the Gradebook war file and jar file">
 		<delete quiet="true">
-			<fileset dir="${jboss.deploy}/tmp"/>
-			<fileset dir="${jboss.deploy}/work"/>
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
 		</delete>
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/> 
-	</target>
-	
-	
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}" />
 
-	<!-- =================================================================== -->
-	<!-- Run JUnit Tests                                                     -->
-	<!-- =================================================================== -->
-	<target name="test" depends="compile.test">
-		<mkdir dir="${build.report}" />
-		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
-			fork="yes">
-			<formatter type="plain" usefile="false" />
-			<formatter type="xml" />
-			<batchtest todir="${build.report}">
-				<fileset dir="${src.dir.test}">
-					<include name="**/Test*.java" />
-					<exclude name="**/Test*All.java" />
-					<exclude name="**/TestInitSurveySession.java" />
-					<exclude name="**/*Action.java" />
-				</fileset>
-			</batchtest>
-			<classpath>
-				<pathelement location="${build.classes.java}" />
-				<pathelement location="${build.classes.test}" />
-				<!--<pathelement location="${conf.hibernate.mapping.dir}" />-->
-				<pathelement location="${conf.web.dir}" />
-				<path refid="project.classpath" />
-			</classpath>
-		</junit>
-	</target>
-
-	<target name="test-report" depends="test">
-		<mkdir dir="${build.report}/html" />
-		<junitreport todir="${build.report}">
-			<fileset dir="${build.report}">
-				<include name="TEST-*.xml" />
+		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/gradebook">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
 			</fileset>
-			<report todir="${build.report}/html" />
-		</junitreport>
+		</copy>
 	</target>
 
 
 	<!-- =========================================== -->
-	<!-- Create/Delete Exploded WAR, Synchronise JSP -->            
+	<!-- Create/Delete Exploded WAR, Synchronise JSP -->
 	<!-- =========================================== -->
 	<target name="delete-exploded-war" description="delete exploded war folder">
 		<!-- delete old war folder tree -->
@@ -295,7 +249,6 @@
 		<delete>
 			<fileset dir="${jboss.deploy}">
 				<include name="temp-${product}.war" />
-				<!--<include name="${product}.jar"/>-->
 			</fileset>
 		</delete>
 	</target>
Index: lams_gradebook/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/conf/language/lams/ApplicationResources.properties	9 Apr 2009 04:55:58 -0000	1.1
+++ lams_gradebook/conf/language/lams/ApplicationResources.properties	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -2,4 +2,50 @@
 #language code: en 
 #locale code: AU 
 
+heading.general.error  =Error
+error.authorisation  =You are not authorised to do this.
+error.general.1  =Sorry, there has been an error.
+error.general.2  =There is a problem processing this request. Close the browser window and try again.
+error.general.3  =If the problem persists please contact your system administrator or the technical forums on  <A HREF="http://lamscommunity.org/">http://lamscommunity.org/</A>.
 
+gradebook.title.window.lessonMonitor  =Gradebook Lesson Monitor
+gradebook.title.window.courseMonitor  =Gradebook Course Monitor
+gradebook.title.window.myGradebook  =My Gradebook
+gradebook.title.courseMonitor  =Course Gradebook for {0}
+gradebook.title.lessonGradebook  =Lesson Gradebook for {0}
+gradebook.title.myGradebook  =Gradebook for {0}
+
+gradebook.gridtitle.usergrid  =Learner Lesson View
+gradebook.gridtitle.activitygrid  =Activity View
+gradebook.columntitle.name  =Name
+gradebook.columntitle.progress  =Progress
+gradebook.columntitle.timeTaken  =Time Taken
+gradebook.columntitle.lessonFeedback  =Lesson Feedback
+gradebook.columntitle.lessonName  =Lesson Name
+gradebook.columntitle.subGroup  =Sub-Group
+gradebook.columntitle.startDate  =Start Date
+gradebook.columntitle.completeDate  =Complete Date
+gradebook.columntitle.mark  =Mark
+gradebook.columntitle.activity  =Activity
+gradebook.columntitle.activityFeedback  =Activity Feedback
+gradebook.columntitle.outputs  =Tool Outputs
+gradebook.columntitle.competences  =Competences
+gradebook.columntitle.averageTimeTaken  =Average Time Taken
+gradebook.columntitle.averageMark  =Average Mark
+gradebook.columntitle.learnerName  =Learner Name
+
+gradebook.function.window.showColumns  =Show/Hide Columns
+gradebook.function.error.enterNumber  =Please enter a number value
+gradebook.function.search.title  =Search Grid
+gradebook.function.search.contains  =contains
+gradebook.function.search.endsWith  =ends with
+gradebook.function.search.startsWith  =starts with
+gradebook.function.search.equalTo  =equal to
+gradebook.function.search.notEqualTo  =not equal to
+
+gradebook.error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+
+label.ok  =OK
+label.cancel  =Cancel
+label.find  =Find
+label.reset  =Reset
\ No newline at end of file
Index: lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties	9 Apr 2009 04:55:58 -0000	1.1
+++ lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -1,3 +1,51 @@
 appName = gradebook 
 #language code: en 
-#locale code: AU 
\ No newline at end of file
+#locale code: AU 
+
+heading.general.error  =Error
+error.authorisation  =You are not authorised to do this.
+error.general.1  =Sorry, there has been an error.
+error.general.2  =There is a problem processing this request. Close the browser window and try again.
+error.general.3  =If the problem persists please contact your system administrator or the technical forums on  <A HREF="http://lamscommunity.org/">http://lamscommunity.org/</A>.
+
+gradebook.title.window.lessonMonitor  =Gradebook Lesson Monitor
+gradebook.title.window.courseMonitor  =Gradebook Course Monitor
+gradebook.title.window.myGradebook  =My Gradebook
+gradebook.title.courseMonitor  =Course Gradebook for {0}
+gradebook.title.lessonGradebook  =Lesson Gradebook for {0}
+gradebook.title.myGradebook  =Gradebook for {0}
+
+gradebook.gridtitle.usergrid  =Learner Lesson View
+gradebook.gridtitle.activitygrid  =Activity View
+gradebook.columntitle.name  =Name
+gradebook.columntitle.progress  =Progress
+gradebook.columntitle.timeTaken  =Time Taken
+gradebook.columntitle.lessonFeedback  =Lesson Feedback
+gradebook.columntitle.lessonName  =Lesson Name
+gradebook.columntitle.subGroup  =Sub-Group
+gradebook.columntitle.startDate  =Start Date
+gradebook.columntitle.completeDate  =Complete Date
+gradebook.columntitle.mark  =Mark
+gradebook.columntitle.activity  =Activity
+gradebook.columntitle.activityFeedback  =Activity Feedback
+gradebook.columntitle.outputs  =Tool Outputs
+gradebook.columntitle.competences  =Competences
+gradebook.columntitle.averageTimeTaken  =Average Time Taken
+gradebook.columntitle.averageMark  =Average Mark
+gradebook.columntitle.learnerName  =Learner Name
+
+gradebook.function.window.showColumns  =Show/Hide Columns
+gradebook.function.error.enterNumber  =Please enter a number value
+gradebook.function.search.title  =Search Grid
+gradebook.function.search.contains  =contains
+gradebook.function.search.endsWith  =ends with
+gradebook.function.search.startsWith  =starts with
+gradebook.function.search.equalTo  =equal to
+gradebook.function.search.notEqualTo  =not equal to
+
+gradebook.error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+
+label.ok  =OK
+label.cancel  =Cancel
+label.find  =Find
+label.reset  =Reset
Index: lams_gradebook/conf/language/rams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/rams/Attic/ApplicationResources.properties,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/conf/language/rams/ApplicationResources.properties	9 Apr 2009 04:55:57 -0000	1.1
+++ lams_gradebook/conf/language/rams/ApplicationResources.properties	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -1,3 +1,51 @@
 appName = gradebook 
 #language code: en 
-#locale code: AU 
\ No newline at end of file
+#locale code: AU 
+
+heading.general.error  =Error
+error.authorisation  =You are not authorised to do this.
+error.general.1  =Sorry, there has been an error.
+error.general.2  =There is a problem processing this request. Close the browser window and try again.
+error.general.3  =If the problem persists please contact your system administrator or the technical forums on  <A HREF="http://lamscommunity.org/">http://lamscommunity.org/</A>.
+
+gradebook.title.window.lessonMonitor  =Gradebook Lesson Monitor
+gradebook.title.window.courseMonitor  =Gradebook Course Monitor
+gradebook.title.window.myGradebook  =My Gradebook
+gradebook.title.courseMonitor  =Course Gradebook for {0}
+gradebook.title.lessonGradebook  =Lesson Gradebook for {0}
+gradebook.title.myGradebook  =Gradebook for {0}
+
+gradebook.gridtitle.usergrid  =Learner Lesson View
+gradebook.gridtitle.activitygrid  =Activity View
+gradebook.columntitle.name  =Name
+gradebook.columntitle.progress  =Progress
+gradebook.columntitle.timeTaken  =Time Taken
+gradebook.columntitle.lessonFeedback  =Lesson Feedback
+gradebook.columntitle.lessonName  =Lesson Name
+gradebook.columntitle.subGroup  =Sub-Group
+gradebook.columntitle.startDate  =Start Date
+gradebook.columntitle.completeDate  =Complete Date
+gradebook.columntitle.mark  =Mark
+gradebook.columntitle.activity  =Activity
+gradebook.columntitle.activityFeedback  =Activity Feedback
+gradebook.columntitle.outputs  =Tool Outputs
+gradebook.columntitle.competences  =Competences
+gradebook.columntitle.averageTimeTaken  =Average Time Taken
+gradebook.columntitle.averageMark  =Average Mark
+gradebook.columntitle.learnerName  =Learner Name
+
+gradebook.function.window.showColumns  =Show/Hide Columns
+gradebook.function.error.enterNumber  =Please enter a number value
+gradebook.function.search.title  =Search Grid
+gradebook.function.search.contains  =contains
+gradebook.function.search.endsWith  =ends with
+gradebook.function.search.startsWith  =starts with
+gradebook.function.search.equalTo  =equal to
+gradebook.function.search.notEqualTo  =not equal to
+
+gradebook.error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+
+label.ok  =OK
+label.cancel  =Cancel
+label.find  =Find
+label.reset  =Reset
\ No newline at end of file
Index: lams_gradebook/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/conf/language/rams/ApplicationResources_en_AU.properties	9 Apr 2009 04:55:58 -0000	1.1
+++ lams_gradebook/conf/language/rams/ApplicationResources_en_AU.properties	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -1,3 +1,51 @@
 appName = gradebook 
 #language code: en 
-#locale code: AU 
\ No newline at end of file
+#locale code: AU 
+
+heading.general.error  =Error
+error.authorisation  =You are not authorised to do this.
+error.general.1  =Sorry, there has been an error.
+error.general.2  =There is a problem processing this request. Close the browser window and try again.
+error.general.3  =If the problem persists please contact your system administrator or the technical forums on  <A HREF="http://lamscommunity.org/">http://lamscommunity.org/</A>.
+
+gradebook.title.window.lessonMonitor  =Gradebook Lesson Monitor
+gradebook.title.window.courseMonitor  =Gradebook Course Monitor
+gradebook.title.window.myGradebook  =My Gradebook
+gradebook.title.courseMonitor  =Course Gradebook for {0}
+gradebook.title.lessonGradebook  =Lesson Gradebook for {0}
+gradebook.title.myGradebook  =Gradebook for {0}
+
+gradebook.gridtitle.usergrid  =Learner Lesson View
+gradebook.gridtitle.activitygrid  =Activity View
+gradebook.columntitle.name  =Name
+gradebook.columntitle.progress  =Progress
+gradebook.columntitle.timeTaken  =Time Taken
+gradebook.columntitle.lessonFeedback  =Lesson Feedback
+gradebook.columntitle.lessonName  =Lesson Name
+gradebook.columntitle.subGroup  =Sub-Group
+gradebook.columntitle.startDate  =Start Date
+gradebook.columntitle.completeDate  =Complete Date
+gradebook.columntitle.mark  =Mark
+gradebook.columntitle.activity  =Activity
+gradebook.columntitle.activityFeedback  =Activity Feedback
+gradebook.columntitle.outputs  =Tool Outputs
+gradebook.columntitle.competences  =Competences
+gradebook.columntitle.averageTimeTaken  =Average Time Taken
+gradebook.columntitle.averageMark  =Average Mark
+gradebook.columntitle.learnerName  =Learner Name
+
+gradebook.function.window.showColumns  =Show/Hide Columns
+gradebook.function.error.enterNumber  =Please enter a number value
+gradebook.function.search.title  =Search Grid
+gradebook.function.search.contains  =contains
+gradebook.function.search.endsWith  =ends with
+gradebook.function.search.startsWith  =starts with
+gradebook.function.search.equalTo  =equal to
+gradebook.function.search.notEqualTo  =not equal to
+
+gradebook.error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+
+label.ok  =OK
+label.cancel  =Cancel
+label.find  =Find
+label.reset  =Reset
\ No newline at end of file
Index: lams_gradebook/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/conf/xdoclet/web-security.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/conf/xdoclet/web-security.xml	9 Apr 2009 04:55:55 -0000	1.1
+++ lams_gradebook/conf/xdoclet/web-security.xml	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -9,6 +9,8 @@
     	    <role-name>GROUP MANAGER</role-name>
     		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>LEARNER</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -35,4 +37,10 @@
 	<security-role>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
+	<security-role>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<role-name>MONITOR</role-name>
+	</security-role>
 	
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	9 Apr 2009 04:55:57 -0000	1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -9,7 +9,8 @@
 	<bean id="gradebookServiceTarget" class="org.lamsfoundation.lams.gradebook.service.GradebookService">
 		<property name="monitoringService"><ref bean="monitoringService"/></property>
 		<property name="toolService"><ref bean="lamsCoreToolService"/></property> 	
-		<property name="lessonService"><ref bean="lessonService"/></property> 	
+		<property name="lessonService"><ref bean="lessonService"/></property> 
+		<property name="userService"><ref bean="userManagementService"/></property>	
 		<property name="gradebookDAO"><ref bean="gradebookDAO"/></property> 	
 	</bean>
 	
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	9 Apr 2009 04:55:58 -0000	1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -57,7 +57,9 @@
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -77,6 +79,7 @@
     private ILamsCoreToolService toolService;
     private IGradebookDAO gradebookDAO;
     private ILessonService lessonService;
+    private IUserManagementService userService;
 
     /**
      * @see org.lamsfoundation.lams.gradebook.service.IGradebookService#getGBActivityRowsForLearner(org.lamsfoundation.lams.lesson.Lesson,
@@ -127,7 +130,7 @@
 	}
 	return gradebookActivityDTOs;
     }
-    
+
     /**
      * @see org.lamsfoundation.lams.gradebook.service.IGradebookService#getGBActivityRowsForLesson(org.lamsfoundation.lams.lesson.Lesson)
      */
@@ -221,8 +224,6 @@
 
     }
 
-
-
     /**
      * @see org.lamsfoundation.lams.gradebook.service.IGradebookService#getGBUserRowsForLesson(org.lamsfoundation.lams.lesson.Lesson)
      */
@@ -365,56 +366,64 @@
 	    if (lessons != null) {
 
 		for (Lesson lesson : lessons) {
-		    if (lesson.getLessonClass().isStaffMember(user)) {
-			GBLessonGridRowDTO lessonRow = new GBLessonGridRowDTO();
-			lessonRow.setLessonName(lesson.getLessonName());
-			lessonRow.setId(lesson.getLessonId());
-			lessonRow.setStartDate(getLocaleDateString(user, lesson.getStartDateTime()));
 
-			if (view == GBGridView.MON_COURSE) {
-			    
-			    // Setting the averages for monitor view
-			    lessonRow.setAverageTimeTaken(gradebookDAO.getAverageDurationLesson(lesson.getLessonId()));
-			    lessonRow.setAverageMark(gradebookDAO.getAverageMarkForLesson(lesson.getLessonId()));
+		    // Dont include lesson in list if the user doesnt have permission
+		    if (!(view == GBGridView.MON_COURSE
+			    && (lesson.getLessonClass().isStaffMember(user) || userService.isUserInRole(user
+				    .getUserId(), organisation.getOrganisationId(), Role.GROUP_MANAGER)) || view == GBGridView.LRN_COURSE
+			    && lesson.getAllLearners().contains(user))) {
+			continue;
+		    }
 
-			    // Set the gradebook monitor url
-			    String gbMonURL = Configuration.get(ConfigurationKeys.SERVER_URL)
-				    + "gradebook/gradebookMonitoring.do?lessonID=" + lesson.getLessonId().toString();
-			    lessonRow.setGradebookMonitorURL(gbMonURL);
-			} else if (view == GBGridView.LRN_COURSE) {
-			    
-			    GradebookUserLesson gbLesson = gradebookDAO.getGradebookUserDataForLesson(lesson.getLessonId(), user.getUserId());
-			    
-			    lessonRow.setAverageTimeTaken(gradebookDAO.getAverageDurationLesson(lesson.getLessonId()));
-			    lessonRow.setAverageMark(gradebookDAO.getAverageMarkForLesson(lesson.getLessonId()));
-			    
-			    if (gbLesson != null) {
-				lessonRow.setMark(gbLesson.getMark());
-				lessonRow.setFeedback(gbLesson.getFeedback());
-			    }
-			    
-			    LearnerProgress learnerProgress = monitoringService.getLearnerProgress(user.getUserId(), lesson
-				    .getLessonId());
-			    lessonRow.setStatus(getLessonStatusStr(learnerProgress));
-			    if (learnerProgress != null) {
-				if (learnerProgress.getStartDate() != null && learnerProgress.getFinishDate() != null) {
-				    lessonRow.setTimeTaken(learnerProgress.getFinishDate().getTime()
-					    - learnerProgress.getStartDate().getTime());
-				}
-				
-				lessonRow.setFinishDate(getLocaleDateString(user, learnerProgress.getFinishDate()));
-			    }
-			}
+		    GBLessonGridRowDTO lessonRow = new GBLessonGridRowDTO();
+		    lessonRow.setLessonName(lesson.getLessonName());
+		    lessonRow.setId(lesson.getLessonId());
+		    lessonRow.setStartDate(getLocaleDateString(user, lesson.getStartDateTime()));
 
-			if (lesson.getOrganisation().getOrganisationId() != organisation.getOrganisationId()) {
-			    lessonRow.setSubGroup(lesson.getOrganisation().getName());
-			} else {
-			    lessonRow.setSubGroup("-");
+		    if (view == GBGridView.MON_COURSE) {
+
+			// Setting the averages for monitor view
+			lessonRow.setAverageTimeTaken(gradebookDAO.getAverageDurationLesson(lesson.getLessonId()));
+			lessonRow.setAverageMark(gradebookDAO.getAverageMarkForLesson(lesson.getLessonId()));
+
+			// Set the gradebook monitor url
+			String gbMonURL = Configuration.get(ConfigurationKeys.SERVER_URL)
+				+ "gradebook/gradebookMonitoring.do?lessonID=" + lesson.getLessonId().toString();
+			lessonRow.setGradebookMonitorURL(gbMonURL);
+		    } else if (view == GBGridView.LRN_COURSE) {
+
+			GradebookUserLesson gbLesson = gradebookDAO.getGradebookUserDataForLesson(lesson.getLessonId(),
+				user.getUserId());
+
+			lessonRow.setAverageTimeTaken(gradebookDAO.getAverageDurationLesson(lesson.getLessonId()));
+			lessonRow.setAverageMark(gradebookDAO.getAverageMarkForLesson(lesson.getLessonId()));
+
+			if (gbLesson != null) {
+			    lessonRow.setMark(gbLesson.getMark());
+			    lessonRow.setFeedback(gbLesson.getFeedback());
 			}
 
-			lessonRows.add(lessonRow);
+			LearnerProgress learnerProgress = monitoringService.getLearnerProgress(user.getUserId(), lesson
+				.getLessonId());
+			lessonRow.setStatus(getLessonStatusStr(learnerProgress));
+			if (learnerProgress != null) {
+			    if (learnerProgress.getStartDate() != null && learnerProgress.getFinishDate() != null) {
+				lessonRow.setTimeTaken(learnerProgress.getFinishDate().getTime()
+					- learnerProgress.getStartDate().getTime());
+			    }
 
+			    lessonRow.setFinishDate(getLocaleDateString(user, learnerProgress.getFinishDate()));
+			}
 		    }
+
+		    if (lesson.getOrganisation().getOrganisationId() != organisation.getOrganisationId()) {
+			lessonRow.setSubGroup(lesson.getOrganisation().getName());
+		    } else {
+			lessonRow.setSubGroup("-");
+		    }
+
+		    lessonRows.add(lessonRow);
+
 		}
 	    }
 
@@ -429,7 +438,7 @@
 	if (user == null || date == null) {
 	    return null;
 	}
-	
+
 	Locale locale = new Locale(user.getLocale().getLanguageIsoCode(), user.getLocale().getCountryIsoCode());
 	String dateStr = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM, locale).format(date);
 	return dateStr;
@@ -656,7 +665,7 @@
 
 	// Fix up outputs html if there are not outputs available
 	if (noOutputs) {
-	    toolOutputsStr = "No output available.";
+	    toolOutputsStr = "-";
 	} else {
 	    toolOutputsStr = "<select style='width:150px;'><option style='width:100%;'>View outputs</option>"
 		    + toolOutputsStr;
@@ -699,5 +708,13 @@
 	this.lessonService = lessonService;
     }
 
+    public IUserManagementService getUserService() {
+	return userService;
+    }
+
+    public void setUserService(IUserManagementService userService) {
+	this.userService = userService;
+    }
+
     // -------------------------------------------------------------------------
 }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java	9 Apr 2009 04:55:56 -0000	1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookLearningAction.java	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -95,15 +95,17 @@
 		}
 		
 		// Validate whether this user is a monitor for this organisation
-		if (!userService.isUserInRole(user.getUserID(), oranisationID, Role.MONITOR)) {
+		if (!userService.isUserInRole(user.getUserID(), oranisationID, Role.LEARNER)) {
 		    logger.error("User " + user.getLogin()
 			    + " is not a learner in the requested course. Cannot access the course for gradebook.");
 		    return displayMessage(mapping, request, "error.authorisation");
 		}
 
 		request.setAttribute("organisationID", oranisationID);
 		request.setAttribute("organisationName", organisation.getName());
+		request.setAttribute("fullName",user.getFirstName() + " "  + user.getLastName());
 		
+		
 		return mapping.findForward("learnercoursegradebook");
 	    }
 	} catch (Exception e) {
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseLearner.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/web/gradebookCourseLearner.jsp	9 Apr 2009 04:55:51 -0000	1.1
+++ lams_gradebook/web/gradebookCourseLearner.jsp	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -31,7 +31,18 @@
 			    pager: 'organisationGridPager',
 			    rowList:[5,10,20,30],
 			    rowNum:10,
-			    colNames:["", 'Lesson Name', 'Sub-Group', 'Progress', 'FeedBack', 'Start Date', 'Finish Date', 'Average Duration', 'Duration', 'Average Mark', 'Mark'],
+			    colNames:[
+			    	'', 
+			    	'<fmt:message key="gradebook.columntitle.lessonName"/>', 
+			    	'<fmt:message key="gradebook.columntitle.subGroup"/>', 
+			    	'<fmt:message key="gradebook.columntitle.progress"/>', 
+			    	'<fmt:message key="gradebook.columntitle.lessonFeedback"/>', 
+			    	'<fmt:message key="gradebook.columntitle.startDate"/>', 
+			    	'<fmt:message key="gradebook.columntitle.completeDate"/>', 
+			    	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
+			    	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+			    	'<fmt:message key="gradebook.columntitle.averageMark"/>', 
+			    	'<fmt:message key="gradebook.columntitle.mark"/>'],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -47,7 +58,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#organisationGrid").clearGridData();
-			    	alert("There was an error loading the Organisation grid");
+			    	alert('<fmt:message key="gradebook.error.loaderror"/>');
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -65,7 +76,16 @@
 						     pager: subgrid_table_id + "_pager",
 							 rowList:[5,10,20,30],
 							 rowNum:10,
-						     colNames: ['Id','Activity','Progress', 'Feedback', 'Average Duration', 'Duration', 'Average Mark', 'Mark'],
+						     colNames: [
+						     	'',
+						     	'<fmt:message key="gradebook.columntitle.activity"/>',
+						     	'<fmt:message key="gradebook.columntitle.progress"/>', 
+						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
+						     	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
+						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+						     	'<fmt:message key="gradebook.columntitle.aveargeMark"/>', 
+						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
 								{name:'rowName', index:'rowName', sortable:false, editable: false, width:100},
@@ -78,7 +98,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	alert("There was an error loading the Learner View grid");
+						    	alert('<fmt:message key="gradebook.error.loaderror"/>');
 						     },
 							 gridComplete: function(){
 							 	toolTip($(".jqgrow"));
@@ -88,7 +108,6 @@
 					  	// Adding button for show/hiding collumn
 					  	jQuery("#"+subgrid_table_id).navButtonAdd("#"+subgrid_table_id+"_pager",{
 							caption: "",
-							title: "Show/Hide Columns",
 							buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 							onClickButton: function(){
 								jQuery("#"+subgrid_table_id).setColumns();
@@ -105,8 +124,6 @@
 				buttonimg:"<lams:LAMSURL />images/find.png", 
 				onClickButton: function(){
 					jQuery("#organisationGrid").searchGrid({
-						Find: "Find", 
-						Clear: "Clear", 
 						top:10, 
 						left:10,
 						sopt:['cn','bw','eq','ne','ew']
@@ -116,7 +133,6 @@
 
 			jQuery("#organisationGrid").navButtonAdd('#organisationGridPager',{
 				caption: "",
-				title: "Show/Hide Columns",
 				buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 				onClickButton: function(){
 					jQuery("#organisationGrid").setColumns();
@@ -133,7 +149,13 @@
 		<div id="header-no-tabs"></div>
 		
 		<div id="content">
-			<h1 class="no-tabs-below">Course Gradebook for ${organisationName}</h1>
+			<h1 class="no-tabs-below">
+				<fmt:message key="gradebook.title.myGradebook">
+					<fmt:param>
+						${fullName}
+					</fmt:param>
+				</fmt:message>
+			</h1>
 			<br />
 			<div style="width: 600px; margin-left: auto; margin-right: auto;">
 				<table id="organisationGrid" class="scroll"></table>
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseMonitor.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/web/gradebookCourseMonitor.jsp	9 Apr 2009 04:55:51 -0000	1.1
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -9,7 +9,7 @@
 
 <lams:html>
 <lams:head>
-	<title>Course Gradebook Monitor</title>
+	<title><fmt:message key="gradebook.title.window.courseMonitor"/></title>
 	<lams:css />
 
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
@@ -30,7 +30,14 @@
 			    pager: 'organisationGridPager',
 			    rowList:[5,10,20,30],
 			    rowNum:10,
-				colNames:["", 'Lesson Name', 'Sub-Group', 'Start Date', 'Average Time Taken', 'Average Mark'],
+				colNames:[
+					'', 
+					'<fmt:message key="gradebook.columntitle.lessonName"/>', 
+					'<fmt:message key="gradebook.columntitle.subGroup"/>', 
+					'<fmt:message key="gradebook.columntitle.startDate"/>', 
+					'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
+			    	'<fmt:message key="gradebook.columntitle.averageMark"/>'
+				],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -41,7 +48,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#organisationGrid").clearGridData();
-			    	alert("There was an error loading the Organisation grid");
+			    	alert('<fmt:message key="gradebook.error.loaderror"/>');
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -62,7 +69,14 @@
 						 pager: subgrid_table_id + "_pager",
 						 rowList:[5,10,20,30],
 						 rowNum:10,
-					     colNames: ['','Full Name','Progress', 'Time Taken', 'Lesson Feedback', 'Mark'],
+					     colNames: [
+					     	'',
+					     	'<fmt:message key="gradebook.columntitle.learnerName"/>',
+					     	'<fmt:message key="gradebook.columntitle.progress"/>', 
+					     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+					     	'<fmt:message key="gradebook.columntitle.lessonFeedBack"/>', 
+			    			'<fmt:message key="gradebook.columntitle.mark"/>'
+					     ],
 					     colModel:[
 					     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 					     	{name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -73,7 +87,7 @@
 					     ],
 					     loadError: function(xhr,st,err) {
 				    		jQuery("#"+subgrid_table_id).clearGridData();
-				    		alert("There was an error loading the User View grid");
+				    		alert('<fmt:message key="gradebook.error.loaderror"/>');
 				    	 },
 					     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
 					     	
@@ -111,8 +125,6 @@
 							buttonimg:"<lams:LAMSURL />images/find.png", 
 							onClickButton: function(){
 								jQuery("#"+subgrid_table_id).searchGrid({
-									Find: "Find", 
-									Clear: "Clear", 
 									top:10, 
 									left:10,
 									sopt:['cn','bw','eq','ne','ew']
@@ -121,7 +133,6 @@
 					  });
 					  jQuery("#"+subgrid_table_id).navButtonAdd("#"+subgrid_table_id+"_pager",{
 						caption: "",
-						title: "Show/Hide Columns",
 						buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 						onClickButton: function(){
 							jQuery("#"+subgrid_table_id).setColumns();
@@ -138,8 +149,6 @@
 				buttonimg:"<lams:LAMSURL />images/find.png", 
 				onClickButton: function(){
 					jQuery("#organisationGrid").searchGrid({
-						Find: "Find", 
-						Clear: "Clear", 
 						top:10, 
 						left:10,
 						sopt:['cn','bw','eq','ne','ew']
@@ -149,7 +158,6 @@
 
 			jQuery("#organisationGrid").navButtonAdd('#organisationGridPager',{
 				caption: "",
-				title: "Show/Hide Columns",
 				buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 				onClickButton: function(){
 					jQuery("#organisationGrid").setColumns();
@@ -166,7 +174,13 @@
 		<div id="header-no-tabs"></div>
 		
 		<div id="content">
-			<h1 class="no-tabs-below">Course Gradebook for ${organisationName}</h1>
+			<h1 class="no-tabs-below">
+				<fmt:message key="gradebook.title.courseMonitor">
+					<fmt:param>
+						${organisationName}
+					</fmt:param>
+				</fmt:message>
+			</h1>
 			<br />
 			<div style="width: 700px; margin-left: auto; margin-right: auto;">
 				<table id="organisationGrid" class="scroll"></table>
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/web/gradebookMonitor.jsp	9 Apr 2009 04:55:51 -0000	1.1
+++ lams_gradebook/web/gradebookMonitor.jsp	14 Apr 2009 06:18:50 -0000	1.1.2.1
@@ -8,7 +8,7 @@
 
 <lams:html>
 <lams:head>
-	<title>Lesson Gradebook Monitor</title>
+	<title><fmt:message key="gradebook.title.window.lessonMonitor"/></title>
 	<lams:css/>
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
@@ -19,7 +19,7 @@
   
 			// Create the user view grid with sub grid for activities	
 			jQuery("#userView").jqGrid({
-				caption: "Learner View",
+				caption: '<fmt:message key="gradebook.gridtitle.usergrid"/>',
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monUserView&lessonID=${lessonDetails.lessonID}",
 			    height: "100%",
@@ -33,7 +33,13 @@
 			    rowList:[5,10,20,30],
 			    rowNum:10,
 				cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=${lessonDetails.lessonID}",
-			    colNames:["", 'Name', 'Progress', 'Time Taken', 'Lesson FeedBack', 'Lesson Mark'],
+			    colNames:["", 
+			    	'<fmt:message key="gradebook.columntitle.name"/>', 
+			    	'<fmt:message key="gradebook.columntitle.progress"/>', 
+			    	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+			    	'<fmt:message key="gradebook.columntitle.lessonFeedBack"/>', 
+			    	'<fmt:message key="gradebook.columntitle.mark"/>'
+			    ],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -44,7 +50,7 @@
 			    ],
 			    loadError: function(xhr,st,err) {
 			    	jQuery("#userView").clearGridData();
-			    	alert("There was an error loading the Learner View grid");
+			    	alert('<fmt:message key="gradebook.error.loaderror"/>');
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -64,7 +70,16 @@
 							 rowList:[5,10,20,30],
 							 rowNum:10,
 						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradebookData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
-						     colNames: ['Id','Activity','Progress','Outputs', 'Competences', 'Time Taken', 'Activity FeedBack', 'Mark'],
+						     colNames: [
+						     	'',
+						     	'<fmt:message key="gradebook.columntitle.activity"/>',
+						     	'<fmt:message key="gradebook.columntitle.progress"/>',
+						     	'<fmt:message key="gradebook.columntitle.outputs"/>', 
+						     	'<fmt:message key="gradebook.columntitle.competences"/>', 
+						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
+						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
 								{name:'rowName',  index:'rowName', sortable:false, editable: false},
@@ -77,7 +92,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 						    	jQuery("#"+subgrid_table_id).clearGridData();
-						    	alert("There was an error loading the Learner View grid");
+						    	alert('<fmt:message key="gradebook.error.loaderror"/>');
 						     },
 						     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
 						     	
@@ -104,7 +119,6 @@
 					  	// Adding button for show/hiding collumn
 					  	jQuery("#"+subgrid_table_id).navButtonAdd("#"+subgrid_table_id+"_pager",{
 							caption: "",
-							title: "Show/Hide Columns",
 							buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 							onClickButton: function(){
 								jQuery("#"+subgrid_table_id).setColumns();
@@ -123,8 +137,6 @@
 					buttonimg:"<lams:LAMSURL />images/find.png", 
 					onClickButton: function(){
 						jQuery("#userView").searchGrid({
-								Find: "Find", 
-								Clear: "Clear", 
 								top:10, 
 								left:10,
 								sopt:['cn','bw','eq','ne','ew']
@@ -135,7 +147,6 @@
 				// Allowing column editing for this grid
 				jQuery("#userView").navButtonAdd('#userViewPager',{
 					caption: "",
-					title: "Show/Hide Columns",
 					buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 					onClickButton: function(){
 						jQuery("#userView").setColumns();
@@ -145,7 +156,7 @@
 				
 				// Creating activity view with sub learner view
 				jQuery("#activityView").jqGrid({
-					caption: "Activity View",
+					caption: '<fmt:message key="gradebook.gridtitle.activitygrid"/>',
 				    datatype: "xml",
 				    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}",
 				    height: "100%",
@@ -156,7 +167,13 @@
 			    	rowNum:10,
 				    sortorder: "asc", 
 				    sortname: "activityId", 
-				    colNames:["", 'Activity Name', 'Average Time Taken', 'Competences', 'Average Mark'],
+				    colNames:[
+				    	'', 
+				    	'<fmt:message key="gradebook.columntitle.name"/>', 
+				    	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
+				    	'<fmt:message key="gradebook.columntitle.competences"/>', 
+				    	'<fmt:message key="gradebook.columntitle.averageMark"/>'
+				    ],
 				    colModel:[
 				      {name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
 					  {name:'rowName', index:'rowName', sortable:true, editable: false},
@@ -166,7 +183,7 @@
 				    ],
 				    loadError: function(xhr,st,err) {
 			    		jQuery("#activityView").clearGridData();
-			    		alert("There was an error loading the Activity View grid");
+			    		alert('<fmt:message key="gradebook.error.loaderror"/>');
 			    	},
 				    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 				    subGrid: true,
@@ -188,7 +205,15 @@
 							 pager: subgrid_table_id + "_pager",
 							 rowList:[5,10,20,30],
 							 rowNum:10,
-						     colNames: ['','Full Name','Progress', 'Time Taken', 'Outputs', 'Activity Feedback', 'Mark'],
+						     colNames: [
+						     	'',
+						     	'<fmt:message key="gradebook.columntitle.name"/>',
+						     	'<fmt:message key="gradebook.columntitle.progress"/>', 
+						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
+						     	'<fmt:message key="gradebook.columntitle.outputs"/>', 
+						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
+						     	'<fmt:message key="gradebook.columntitle.mark"/>'
+						     ],
 						     colModel:[
 						     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 						     	{name:'rowName',index:'rowName', sortable:true, editable:false},
@@ -200,7 +225,7 @@
 						     ],
 						     loadError: function(xhr,st,err) {
 					    		jQuery("#"+subgrid_table_id).clearGridData();
-					    		alert("There was an error loading the Activity View grid");
+					    		alert('<fmt:message key="gradebook.error.loaderror"/>');
 					    	 },
 						     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
 						     	
@@ -239,8 +264,6 @@
 								buttonimg:"<lams:LAMSURL />images/find.png", 
 								onClickButton: function(){
 									jQuery("#"+subgrid_table_id).searchGrid({
-																		Find: "Find", 
-																		Clear: "Clear", 
 																		top:10, 
 																		left:10,
 																		sopt:['cn','bw','eq','ne','ew']
@@ -251,7 +274,6 @@
 						  // Allowing column editing for this grid
 						  jQuery("#"+subgrid_table_id).navButtonAdd("#"+subgrid_table_id+"_pager",{
 							caption: "",
-							title: "Show/Hide Columns",
 							buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 							onClickButton: function(){
 								jQuery("#"+subgrid_table_id).setColumns();
@@ -266,7 +288,7 @@
 				// Enable show/hide columns
 				jQuery("#activityView").navButtonAdd('#activityViewPager',{
 					caption: "",
-					title: "Show/Hide Columns",
+					title: '<fmt:message key="gradebook.function.window.showColumns"/>',
 					buttonimg:"<lams:LAMSURL />images/table_edit.png", 
 					onClickButton: function(){
 						jQuery("#activityView").setColumns();
@@ -282,7 +304,13 @@
 		
 		<div id="header-no-tabs"></div> <!--closes footer-->
 		<div id="content" >
-			<h1 class="no-tabs-below">Lesson Gradebook for ${lessonDetails.lessonName}</h1> 
+			<h1 class="no-tabs-below">
+				<fmt:message key="gradebook.title.lessonGradebook">
+					<fmt:param>
+						${lessonDetails.lessonName}
+					</fmt:param>
+				</fmt:message>
+			</h1> 
 			<br />
 			<div style="width:700px; margin-left:auto; margin-right:auto;">
 				<table id="userView" class="scroll" ></table>
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/Attic/web.xml,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/web/WEB-INF/web.xml	9 Apr 2009 04:55:57 -0000	1.1
+++ lams_gradebook/web/WEB-INF/web.xml	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -254,6 +254,8 @@
     	    <role-name>GROUP MANAGER</role-name>
     		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>LEARNER</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -280,5 +282,11 @@
 	<security-role>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
+	<security-role>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<role-name>MONITOR</role-name>
+	</security-role>
 
 </web-app>
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/includes/jsp/jqGridIncludes.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	9 Apr 2009 04:55:58 -0000	1.1
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	14 Apr 2009 06:18:51 -0000	1.1.2.1
@@ -39,7 +39,7 @@
 		    processData: "Processing...",
 		    msg: {
 		        required:"Field is required",
-		        number:"Please, enter valid number",
+		        number:'<fmt:message key="gradebook.function.error.enterNumber"/>',
 		        minValue:"value must be greater than or equal to ",
 		        maxValue:"value must be less than or equal to",
 		        email: "is not a valid e-mail",
@@ -50,12 +50,29 @@
 		
 		// search entries
 		$.jgrid.search = {
-			    caption: "Search Names...",
-			    Find: "Find",
-			    Reset: "Reset",
-			    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','ends with','contains' ]
+			    caption: '<fmt:message key="gradebook.function.search.title"/>',
+			    Find: '<fmt:message key="label.find"/>',
+			    Reset: '<fmt:message key="label.reset"/>',
+			    odata : [
+			    	'<fmt:message key="gradebook.function.search.equalTo"/>', 
+			    	'<fmt:message key="gradebook.function.search.notEqualTo"/>', 
+			    	'less', 
+			    	'less or equal',
+			    	'greater',
+			    	'greater or equal', 
+			    	'<fmt:message key="gradebook.function.search.startsWith"/>',
+			    	'<fmt:message key="gradebook.function.search.endsWith"/>',
+			    	'<fmt:message key="gradebook.function.search.contains"/>' 
+			    ]
 		};
 		
+		// setcolumns module
+		$.jgrid.col ={
+		    caption: '<fmt:message key="gradebook.function.window.showColumns"/>',
+		    bSubmit: '<fmt:message key="label.ok"/>',
+		    bCancel: '<fmt:message key="label.cancel"/>'
+		};
+		
 		// ---------------------------------------------------------------------