Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources.properties,v diff -u -r1.42.2.1 -r1.42.2.2 --- lams_tool_laqa/conf/language/lams/ApplicationResources.properties 15 Sep 2015 13:10:02 -0000 1.42.2.1 +++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties 3 Nov 2015 02:49:59 -0000 1.42.2.2 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Sep 15 06:53:36 CST 2015 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 26 07:19:34 CST 2015 #=================== labels for Q&A =================# @@ -283,6 +283,7 @@ warning.minimum.number.words =There is a minimum required number of words in a comment: {0}. So far you''ve entered {1} word(s). warning.comment.blank =Comment can not be blank. label.no.reedit.allowed =No re-edit allowed +label.search =Search... -#======= End labels: Exported 277 labels for en AU ===== +#======= End labels: Exported 278 labels for en AU ===== Index: lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties,v diff -u -r1.33 -r1.33.2.1 --- lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties 8 Jan 2014 18:14:26 -0000 1.33 +++ lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties 3 Nov 2015 02:49:59 -0000 1.33.2.1 @@ -2,7 +2,7 @@ #language code: el #locale code: GR - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Jan 08 12:14:09 CST 2014 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Mar 29 04:47:56 CST 2015 #=================== labels for Q&A =================# @@ -17,7 +17,6 @@ label.authoring.qa =\u0395\u03c1\u03c9\u03c4\u03ae\u03c3\u03b7(\u03b5\u03b9\u03c2) & \u0391\u03c0\u03b1\u03bd\u03c4\u03ae\u03c3\u03b7(\u03b5\u03b9\u03c2) label.basic =\u0392\u03b1\u03c3\u03b9\u03ba\u03ac label.advanced =\u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03b1 -label.instructions =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 label.authoring.title =\u03a4\u03af\u03c4\u03bb\u03bf\u03c2 label.authoring.instructions =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 label.summary =\u03a3\u03cd\u03bd\u03bf\u03c8\u03b7 @@ -31,11 +30,7 @@ label.report.title =\u03a4\u03af\u03c4\u03bb\u03bf\u03c2 \u03ad\u03ba\u03b8\u03b5\u03c3\u03b7\u03c2 label.monitoringReport.title =\u03a4\u03af\u03c4\u03bb\u03bf\u03c2 \u0388\u03ba\u03b8\u03b5\u03c3\u03b7\u03c2 \u0395\u03c0\u03bf\u03c0\u03c4\u03b5\u03af\u03b1\u03c2 label.offlineInstructions =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c0\u03cc\u03bd\u03b7\u03c3\u03b7 \u03c7\u03c9\u03c1\u03af\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7: -label.offlineInstructions.col =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03c7\u03c9\u03c1\u03af\u03c2 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7: label.onlineInstructions =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c0\u03cc\u03bd\u03b7\u03c3\u03b7 \u03bc\u03b5 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7: -label.onlineInstructions.col =\u039f\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c0\u03cc\u03bd\u03b7\u03c3\u03b7 \u03bc\u03b5 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7: -label.offlineFiles = \u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03b3\u03b9\u03b1 \u03c7\u03c9\u03c1\u03af\u03c2 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7: -label.onlineFiles =\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c3\u03b5 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 label.exportPortfolio.simple =\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae \u03a6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 \u0395\u03c1\u03b3\u03b1\u03c3\u03b9\u03ce\u03bd label.exportPortfolio =\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae \u03a6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 \u0395\u03c1\u03b3\u03b1\u03c3\u03b9\u03ce\u03bd \u0395/\u0391 instructions.type.online =\u03a3\u03b5 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 @@ -59,9 +54,7 @@ label.upload =\u0391\u03c0\u03bf\u03c3\u03c4\u03bf\u03bb\u03ae label.uploadedOfflineFiles =\u0391\u03c0\u03b5\u03c3\u03c4\u03b1\u03bb\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03b3\u03b9\u03b1 \u03c7\u03c9\u03c1\u03af\u03c2 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 label.uploadedOnlineFiles =\u0391\u03c0\u03b5\u03c3\u03c4\u03b1\u03bb\u03bc\u03ad\u03bd\u03b1 \u03b3\u03b9\u03b1 \u03c3\u03b5 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03b5 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u0391\u03c1\u03c7\u03b5\u03af\u03b1 : -label.attachments =\u0395\u03c0\u03b9\u03c3\u03c5\u03bd\u03b1\u03c0\u03c4\u03cc\u03bc\u03b5\u03bd\u03b1 label.type =\u03a4\u03cd\u03c0\u03bf\u03c2 -label.download =\u039b\u03ae\u03c8\u03b7 label.view =\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae label.delete =\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae feedback =\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c3\u03c5\u03bc\u03c0\u03bb\u03b7\u03c1\u03ce\u03c3\u03c4\u03b5 \u03c4\u03bf \u03b1\u03ba\u03cc\u03bb\u03bf\u03c5\u03b8\u03bf \u03b8\u03ad\u03bc\u03b1 \u03c0\u03c1\u03b9\u03bd \u03c4\u03b7\u03bd \u03c5\u03c0\u03bf\u03b2\u03bf\u03bb\u03ae @@ -101,7 +94,6 @@ label.stats.totalLearners =\u03a3\u03c5\u03bd\u03bf\u03bb\u03b9\u03ba\u03cc\u03c2 \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u0395\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03c9\u03bd label.stats.allGroups =\u039f\u03bb\u03b5\u03c2 \u03bf\u03b9 \u039f\u03bc\u03ac\u03b4\u03b5\u03c2 label.stats.totalAllGroups =\u03a3\u03c5\u03bd\u03bf\u03bb\u03b9\u03ba\u03cc\u03c2 \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u0395\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03c9\u03bd -label.learning.forceOfflineMessage =\u0391\u03c5\u03c4\u03ae \u03b7 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03b4\u03b5\u03bd \u03b3\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 \u03c3\u03c4\u03bf\u03bd \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b4\u03b5\u03af\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03c0\u03bf\u03c0\u03c4\u03b7 \u03c3\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03bb\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2. error.defineLater =\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c0\u03b5\u03c1\u03b9\u03bc\u03ad\u03bd\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ba\u03b1\u03b8\u03b7\u03b3\u03b7\u03c4\u03ae \u03bd\u03b1 \u03bf\u03bb\u03bf\u03ba\u03bb\u03b7\u03c1\u03ce\u03c3\u03b5\u03b9 \u03c4\u03bf \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03bf \u03b1\u03c5\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2. error.authoringUser.notAvailable =\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf\u03c5 \u0394\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2! \u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c3\u03c5\u03bd\u03b5\u03c7\u03af\u03c3\u03b5\u03c4\u03b5. \u03a4\u03bf \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0394\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b1\u03bd\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03bc\u03b9\u03b1 \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 error.noLearnerActivity =\u03a3\u03c5\u03bd\u03bf\u03c0\u03c4\u03b9\u03ba\u03ae \u03ad\u03ba\u03b8\u03b5\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03b7 \u03b1\u03c6\u03bf\u03cd \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 \u03c0\u03bf\u03c5 \u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b1\u03bd \u03c4\u03b7 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1. @@ -261,6 +253,13 @@ label.learning.answer =\u0391\u03c0\u03ac\u03bd\u03c4\u03b7\u03c3\u03b7 label.learning.rating =\u0392\u03b1\u03b8\u03bc\u03bf\u03bb\u03bf\u03b3\u03af\u03b1 button.submit =\u039f\u03bb\u03bf\u03ba\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 +label.waiting.for.leader =\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce, \u03c0\u03b5\u03c1\u03b9\u03bc\u03ad\u03bd\u03b5\u03c4\u03b5 \u03bc\u03ad\u03c7\u03c1\u03b9 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf\u03c2 \u03bd\u03b1 \u03b3\u03af\u03bd\u03b5\u03b9 \u03bf \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u03bf\u03bc\u03ac\u03b4\u03b1\u03c2. +label.users.from.group =\u0386\u03bb\u03bb\u03bf\u03b9 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03b9 \u03c0\u03bf\u03c5 \u03c3\u03c5\u03bc\u03bc\u03b5\u03c4\u03ad\u03c7\u03bf\u03c5\u03bd \u03c3\u03b5 \u03b1\u03c5\u03c4\u03ae \u03c4\u03b7\u03bd \u03bf\u03bc\u03ac\u03b4\u03b1: +label.use.select.leader.tool.output =\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ad\u03c2 \u03b1\u03c0\u03cc \u03c4\u03bf \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae +label.group.leader =\u03a3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u039f\u03bc\u03ac\u03b4\u03b1\u03c2: {0} +label.modify.users.response =\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03c0\u03ac\u03bd\u03c4\u03b7\u03c3\u03b7\u03c2 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c5 +label.info.use.select.leader.outputs =\u0397 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c3\u03c5\u03bd\u03c4\u03bf\u03bd\u03b9\u03c3\u03c4\u03ae \u03bf\u03bc\u03ac\u03b4\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03b7 +label.votes =\u03c8\u03ae\u03c6\u03bf\u03b9 -#======= End labels: Exported 255 labels for el GR ===== +#======= End labels: Exported 254 labels for el GR ===== Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.46.2.2 -r1.46.2.3 --- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties 15 Sep 2015 13:10:02 -0000 1.46.2.2 +++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties 3 Nov 2015 02:49:59 -0000 1.46.2.3 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Sep 15 06:53:36 CST 2015 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 26 07:19:34 CST 2015 #=================== labels for Q&A =================# @@ -283,6 +283,7 @@ warning.minimum.number.words =There is a minimum required number of words in a comment: {0}. So far you''ve entered {1} word(s). warning.comment.blank =Comment can not be blank. label.no.reedit.allowed =No re-edit allowed +label.search =Search... -#======= End labels: Exported 277 labels for en AU ===== +#======= End labels: Exported 278 labels for en AU ===== Index: lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties,v diff -u -r1.22.2.1 -r1.22.2.2 --- lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties 15 Sep 2015 13:10:02 -0000 1.22.2.1 +++ lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties 3 Nov 2015 02:49:59 -0000 1.22.2.2 @@ -2,7 +2,7 @@ #language code: es #locale code: ES - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Sep 15 06:53:31 CST 2015 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 26 07:19:30 CST 2015 #=================== labels for Q&A =================# @@ -283,6 +283,7 @@ warning.minimum.number.words =Hay un n\u00famero m\u00ednimo de palabras en un comentario: {0}. Hasta ahora usted ha entrado {1} palabra(s). warning.comment.blank =El comentario no puede estar en blanco. label.no.reedit.allowed =No permitir re-edici\u00f3n +label.search =Buscar... -#======= End labels: Exported 277 labels for es ES ===== +#======= End labels: Exported 278 labels for es ES ===== Index: lams_tool_laqa/conf/language/lams/ApplicationResources_fr_FR.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_fr_FR.properties,v diff -u -r1.18 -r1.18.2.1 --- lams_tool_laqa/conf/language/lams/ApplicationResources_fr_FR.properties 31 Mar 2014 17:02:00 -0000 1.18 +++ lams_tool_laqa/conf/language/lams/ApplicationResources_fr_FR.properties 3 Nov 2015 02:49:59 -0000 1.18.2.1 @@ -2,7 +2,7 @@ #language code: fr #locale code: FR - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 31 10:52:43 CST 2014 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Jun 18 10:55:42 CST 2015 #=================== labels for Q&A =================# @@ -257,6 +257,9 @@ label.users.from.group =Autres apprenants qui participant dans le groupe actuel: label.use.select.leader.tool.output =Utilisez l'outil de s\u00e9lection animateur de groupe pour choisir un chef de groupe label.group.leader =Animateur de groupe: {0} +label.modify.users.response =Modifier la r\u00e9ponse de l'apprenant +label.info.use.select.leader.outputs =L'option de animateur de groupe est activ\u00e9 +label.votes =votes -#======= End labels: Exported 251 labels for fr FR ===== +#======= End labels: Exported 254 labels for fr FR ===== Index: lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties,v diff -u -r1.25 -r1.25.2.1 --- lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties 8 Jan 2014 18:14:26 -0000 1.25 +++ lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties 3 Nov 2015 02:49:59 -0000 1.25.2.1 @@ -2,7 +2,7 @@ #language code: no #locale code: NO - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Jan 08 12:14:03 CST 2014 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Mar 29 04:47:55 CST 2015 #=================== labels for Q&A =================# @@ -17,7 +17,6 @@ label.authoring.qa =Sp\u00f8rsm\u00e5l og Svar label.basic =Grunnlag label.advanced =Avansert -label.instructions =Informasjon label.authoring.title =Tittel label.authoring.instructions =Informasjon label.summary =Status @@ -31,11 +30,7 @@ label.report.title =Rapport tittel label.monitoringReport.title =Kontrollrapport tittel label.offlineInstructions =Off-line informasjon -label.offlineInstructions.col =Off-line informasjon: label.onlineInstructions =On-line informasjon -label.onlineInstructions.col =On-line informasjon: -label.offlineFiles =Off-line filer: -label.onlineFiles =On-line filer: label.exportPortfolio.simple =Eksporter mappe label.exportPortfolio =S&S eksport mappe instructions.type.online =On-line @@ -59,9 +54,7 @@ label.upload =Last opp label.uploadedOfflineFiles =Opplastete off-line filer: label.uploadedOnlineFiles =Opplastete on-line filer: -label.attachments =Vedlegg label.type =M\u00f8nster -label.download =Last ned label.view =Vis label.delete =Slett feedback =Vennligst besvar de f\u00f8lgende moment f\u00f8r innsendelse. @@ -101,7 +94,6 @@ label.stats.totalLearners =Total antall studenter: label.stats.allGroups =Alle grupper: label.stats.totalAllGroups =Totalt antall av alle studenter: -label.learning.forceOfflineMessage =Denne aktiviteten skal ikke utf\u00f8res med datamaskinen. Vennligst konferer foreleseren. error.defineLater =Vennligst vent til at foreleseren har gjort ferdig innholdet for denne aktiviteten. error.authoringUser.notAvailable =Verkt\u00f8y feil ! Kan ikke fortsette. Verkt\u00f8yaktiviteten krever en bruker id. error.noLearnerActivity =Statusrapport er ikke tilgjengelig fordi ingen brukere har gjennomf\u00f8rt aktiviteten enda. @@ -261,6 +253,13 @@ label.learning.answer =Svar label.learning.rating =Niv\u00e5 button.submit =Avslutt +label.waiting.for.leader =Vent til en er blitt leder +label.users.from.group =Andre studenter som deltar i denne gruppen: +label.use.select.leader.tool.output =Bruk ledere fra Velg leder verkt\u00f8yet +label.group.leader =Gruppe leder: {0} +label.modify.users.response =Endre p\u00e5 steudentens svar +label.info.use.select.leader.outputs =Gruppe leder opsjonen er koblet til +label.votes =stemmer -#======= End labels: Exported 255 labels for no NO ===== +#======= End labels: Exported 254 labels for no NO ===== Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.95.2.3 -r1.95.2.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 3 Jul 2015 16:43:31 -0000 1.95.2.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 3 Nov 2015 02:49:58 -0000 1.95.2.4 @@ -30,8 +30,12 @@ public interface QaAppConstants { public static final int SORT_BY_NO = 0; - public static final int SORT_BY_ANSWER_ASC = 1; - public static final int SORT_BY_ANSWER_DESC = 2; + public static final int SORT_BY_ANSWER_ASC = 3; // learner + public static final int SORT_BY_ANSWER_DESC = 4; // learner + public static final int SORT_BY_USERNAME_ASC = 1; // monitoring + public static final int SORT_BY_USERNAME_DESC = 2; // monitoring + public static final int SORT_BY_RATING_ASC = 5; // learner & monitoring + public static final int SORT_BY_RATING_DESC = 6; // learner & monitoring public static final String MY_SIGNATURE = "laqa11"; public static final String TOOL_CONTENT_ID = "toolContentID"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java,v diff -u -r1.15.2.1 -r1.15.2.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java 2 Sep 2014 20:25:31 -0000 1.15.2.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java 3 Nov 2015 02:49:58 -0000 1.15.2.2 @@ -48,8 +48,8 @@ List getResponseBySessionAndQuestion(final Long qaSessionId, final Long questionId); - List getResponsesForTablesorter(final Long qaSessionId, final Long questionId, final Long userId, - int page, int size, int sorting); + List getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId, final Long questionId, final Long userId, + int page, int size, int sorting, String searchString); - int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId); + int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId, String searchString); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java,v diff -u -r1.18.2.6 -r1.18.2.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 25 Sep 2015 13:28:15 -0000 1.18.2.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 3 Nov 2015 02:49:59 -0000 1.18.2.7 @@ -25,6 +25,7 @@ import java.util.List; +import org.hibernate.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaUsrResp; @@ -42,18 +43,38 @@ private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION = "from qaUsrResp in class QaUsrResp " + " where qaUsrResp.qaQueUser.qaSession.qaSessionId=:qaSessionId and qaUsrResp.qaQuestion.uid=:questionId"; - private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT = "from qaUsrResp in class QaUsrResp " - + "where qaUsrResp.qaQueUser.qaSession.qaSessionId=:qaSessionId AND qaUsrResp.qaQuestion.uid=:questionId AND qaUsrResp.qaQueUser.queUsrId!=:excludeUserId order by "; - + private static final String LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH = "from qaUsrResp in class QaUsrResp " + + " where qaUsrResp.qaQueUser.qaSession.qaSessionId=:qaSessionId AND qaUsrResp.qaQuestion.uid=:questionId AND qaUsrResp.qaQueUser.queUsrId!=:excludeUserId " + + " AND qaUsrResp.qaQueUser.fullname LIKE CONCAT('%', :searchString, '%') " + + " order by "; + + private static final String SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING = "SELECT resp.*, AVG(rating.rating) avg_rating" + + " FROM tl_laqa11_usr_resp resp" + + " JOIN tl_laqa11_que_usr usr" + + " ON resp.qa_que_content_id = :questionId AND resp.que_usr_id = usr.uid " + + " AND usr.que_usr_id!=:excludeUserId " + + " JOIN tl_laqa11_session sess " + + " ON usr.qa_session_id = sess.uid AND sess.qa_session_id = :qaSessionId " + + " AND usr.fullname LIKE CONCAT('%', :searchString, '%')" + + " LEFT JOIN (" + + " SELECT rat.item_id, rat.rating FROM lams_rating rat" + + " JOIN lams_rating_criteria crit" + + " ON rat.rating_criteria_id = crit.rating_criteria_id AND crit.tool_content_id = :toolContentId" + + " ) rating" + + " ON rating.item_id = resp.response_id" + + " GROUP BY response_id" + + " ORDER BY "; + private static final String LOAD_ATTEMPT_FOR_USER = "from qaUsrResp in class QaUsrResp " + "where qaUsrResp.qaQueUser.uid=:userUid order by qaUsrResp.qaQuestion.displayOrder asc"; private static final String GET_COUNT_RESPONSES_BY_QACONTENT = "SELECT COUNT(*) from " + QaUsrResp.class.getName() + " as r where r.qaQuestion.qaContent.qaContentId=?"; - private static final String GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION = "SELECT COUNT(*) from " + private static final String GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION_WITH_NAME_SEARCH = "SELECT COUNT(*) from " + QaUsrResp.class.getName() - + " as r where r.qaQueUser.qaSession.qaSessionId=? and r.qaQuestion.uid=? AND r.qaQueUser.queUsrId!=?"; + + " as r where r.qaQueUser.qaSession.qaSessionId=? and r.qaQuestion.uid=? AND r.qaQueUser.queUsrId!=?" + + " and r.qaQueUser.fullname LIKE CONCAT('%', ?, '%') "; public void createUserResponse(QaUsrResp qaUsrResp) { getSession().save(qaUsrResp); @@ -91,10 +112,12 @@ .setLong("qaSessionId", qaSessionId.longValue()).setLong("questionId", questionId.longValue()).list(); } + @SuppressWarnings("unchecked") @Override - public List getResponsesForTablesorter(final Long qaSessionId, final Long questionId, final Long excludeUserId, - int page, int size, int sorting) { - String sortingOrder = ""; + public List getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId, final Long questionId, final Long excludeUserId, + int page, int size, int sorting, String searchString) { + String sortingOrder; + boolean useAverageRatingSort = false; switch (sorting) { case QaAppConstants.SORT_BY_NO: sortingOrder = "qaUsrResp.attemptTime"; @@ -105,13 +128,46 @@ case QaAppConstants.SORT_BY_ANSWER_DESC: sortingOrder = "answer DESC"; break; + case QaAppConstants.SORT_BY_USERNAME_ASC: + sortingOrder = "qaUsrResp.qaQueUser.fullname ASC"; + break; + case QaAppConstants.SORT_BY_USERNAME_DESC: + sortingOrder = "qaUsrResp.qaQueUser.fullname DESC"; + break; + case QaAppConstants.SORT_BY_RATING_ASC: + sortingOrder = " avg_rating ASC"; + useAverageRatingSort = true; + break; + case QaAppConstants.SORT_BY_RATING_DESC: + sortingOrder = " avg_rating DESC"; + useAverageRatingSort = true; + break; + default: + sortingOrder = " resp.attempt_time"; // default if we get an unexpected sort order } + + Query query = null; - return getSessionFactory().getCurrentSession() - .createQuery(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT + sortingOrder) - .setLong("qaSessionId", qaSessionId.longValue()).setLong("questionId", questionId.longValue()) - .setLong("excludeUserId", excludeUserId.longValue()).setFirstResult(page * size).setMaxResults(size) - .list(); + if ( useAverageRatingSort ) { + query = getSessionFactory().getCurrentSession() + .createSQLQuery(SQL_LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH_AVG_RATING+sortingOrder).addEntity(QaUsrResp.class) + .setLong("toolContentId", toolContentId.longValue()); + } else { + query = getSessionFactory().getCurrentSession() + .createQuery(LOAD_ATTEMPT_FOR_SESSION_AND_QUESTION_LIMIT_WITH_NAME_SEARCH+sortingOrder); + } + + query.setLong("questionId", questionId.longValue()); + query.setLong("qaSessionId", qaSessionId.longValue()); + query.setLong("excludeUserId", excludeUserId.longValue()); + + // support for custom search from a toolbar + searchString = searchString == null ? "" : searchString; + query.setString("searchString", searchString); + + query.setFirstResult(page * size); + query.setMaxResults(size); + return query.list(); } @Override @@ -130,10 +186,11 @@ return ((Number) list.get(0)).intValue(); } - public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId) { + public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId, String searchString) { - List list = doFind(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION, - new Object[] { qaSessionId, questionId, excludeUserId }); + String filter = searchString != null ? searchString.trim() : ""; + List list = doFind(GET_COUNT_RESPONSES_FOR_SESSION_AND_QUESTION_WITH_NAME_SEARCH, + new Object[] { qaSessionId, questionId, excludeUserId, filter }); if (list == null || list.size() == 0) { return 0; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.66.2.4 -r1.66.2.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 15 Jun 2015 22:24:55 -0000 1.66.2.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 3 Nov 2015 02:49:58 -0000 1.66.2.5 @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.SortedSet; @@ -108,11 +107,11 @@ List getResponseBySessionAndQuestion(final Long qaSessionId, final Long questionId); - List getResponsesForTablesorter(final Long qaSessionId, final Long questionId, final Long excludeUserId, - int page, int size, int sorting); + List getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId, final Long questionId, final Long excludeUserId, + int page, int size, int sorting, String searchString); + + int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId, String searchString); - int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, final Long excludeUserId); - /** * Creates or updates response with answer submitted by user. * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.111.2.15 -r1.111.2.16 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 25 Sep 2015 13:28:15 -0000 1.111.2.15 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 3 Nov 2015 02:49:58 -0000 1.111.2.16 @@ -308,15 +308,15 @@ } @Override - public List getResponsesForTablesorter(final Long qaSessionId, final Long questionId, - final Long excludeUserId, int page, int size, int sorting) { - return qaUsrRespDAO.getResponsesForTablesorter(qaSessionId, questionId, excludeUserId, page, size, sorting); + public List getResponsesForTablesorter(final Long toolContentId, final Long qaSessionId, final Long questionId, + final Long excludeUserId, int page, int size, int sorting, String searchString) { + return qaUsrRespDAO.getResponsesForTablesorter(toolContentId, qaSessionId, questionId, excludeUserId, page, size, sorting, searchString); } @Override public int getCountResponsesBySessionAndQuestion(final Long qaSessionId, final Long questionId, - final Long excludeUserId) { - return qaUsrRespDAO.getCountResponsesBySessionAndQuestion(qaSessionId, questionId, excludeUserId); + final Long excludeUserId, String searchString) { + return qaUsrRespDAO.getCountResponsesBySessionAndQuestion(qaSessionId, questionId, excludeUserId, searchString); } @Override Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.53.2.9 -r1.53.2.10 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 8 Oct 2015 19:26:07 -0000 1.53.2.9 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 3 Nov 2015 02:49:59 -0000 1.53.2.10 @@ -1042,24 +1042,31 @@ //paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); int page = WebUtil.readIntParam(request, "page"); - Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true); + Integer sortByCol1 = WebUtil.readIntParam(request, "column[0]", true); + Integer sortByCol2 = WebUtil.readIntParam(request, "column[1]", true); + String searchString = request.getParameter("fcol[0]"); int sorting = QaAppConstants.SORT_BY_NO; - if (isSort1 != null && isSort1.equals(0)) { - sorting = QaAppConstants.SORT_BY_ANSWER_ASC; - } else if (isSort1 != null && isSort1.equals(1)) { - sorting = QaAppConstants.SORT_BY_ANSWER_DESC; + if (sortByCol1 != null ) { + if ( isMonitoring ) + sorting = sortByCol1.equals(0) ? QaAppConstants.SORT_BY_USERNAME_ASC : QaAppConstants.SORT_BY_USERNAME_DESC; + else + sorting = sortByCol1.equals(0) ? QaAppConstants.SORT_BY_ANSWER_ASC : QaAppConstants.SORT_BY_ANSWER_DESC; + + } else if ( sortByCol2 != null ) { + sorting = sortByCol2.equals(0) ? QaAppConstants.SORT_BY_RATING_ASC : QaAppConstants.SORT_BY_RATING_DESC; } + + List responses = qaService.getResponsesForTablesorter(qaContentId, qaSessionId, questionUid, userId, page, size, + sorting, searchString); - List responses = qaService.getResponsesForTablesorter(qaSessionId, questionUid, userId, page, size, - sorting); - JSONObject responcedata = new JSONObject(); JSONArray rows = new JSONArray(); - responcedata.put("total_rows", qaService.getCountResponsesBySessionAndQuestion(qaSessionId, questionUid, userId)); + responcedata.put("total_rows", qaService.getCountResponsesBySessionAndQuestion(qaSessionId, questionUid, userId, searchString)); - //handle rating criterias + // handle rating criterias - even though we may have searched on ratings earlier we can't use the average ratings + // calculated as they may have been averages over more than one criteria. List itemRatingDtos = null; if (isAllowRateAnswers && !responses.isEmpty()) { //create itemIds list Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v diff -u -r1.53.2.7 -r1.53.2.8 --- lams_tool_laqa/web/learning/LearnerRep.jsp 21 Oct 2015 01:47:34 -0000 1.53.2.7 +++ lams_tool_laqa/web/learning/LearnerRep.jsp 3 Nov 2015 02:49:59 -0000 1.53.2.8 @@ -59,9 +59,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v diff -u -r1.32.2.7 -r1.32.2.8 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 21 Oct 2015 01:47:34 -0000 1.32.2.7 +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 3 Nov 2015 02:49:59 -0000 1.32.2.8 @@ -60,9 +60,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/LearnerRep.jsp,v diff -u -r1.10.2.7 -r1.10.2.8 --- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp 21 Oct 2015 01:47:34 -0000 1.10.2.7 +++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp 3 Nov 2015 02:49:59 -0000 1.10.2.8 @@ -63,9 +63,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp,v diff -u -r1.11.2.7 -r1.11.2.8 --- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp 21 Oct 2015 01:47:34 -0000 1.11.2.7 +++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp 3 Nov 2015 02:49:59 -0000 1.11.2.8 @@ -63,9 +63,6 @@ widthFixed: true, widgets: ['zebra'], headers: { - 1: { - sorter: false - }, 2: { sorter: false } Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.39.2.7 -r1.39.2.8 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 15 Oct 2015 11:26:01 -0000 1.39.2.7 +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 3 Nov 2015 02:49:59 -0000 1.39.2.8 @@ -138,6 +138,7 @@ + @@ -148,15 +149,14 @@ $(".tablesorter").tablesorter({ theme: 'blue', widthFixed: true, - widgets: ['zebra'], - headers: { - 1: { - sorter: false - }, - 2: { - sorter: false - } - } + widgets: ["zebra", "filter"], + headers: { 1: { filter: false }, 2: { filter: false, sorter: false } }, + widgetOptions : { + // include column filters + filter_columnFilters: true, + filter_placeholder: { search : '' }, + filter_searchDelay: 700 + } }); $(".tablesorter").each(function() { @@ -169,7 +169,7 @@ // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds // the filterList to the url into an "fcol" array. // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url - ajaxUrl : "?method=getResponses&page={page}&size={size}&{sortList:column}&isMonitoring=true&isAllowRateAnswers=${qaContent.allowRateAnswers}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $(this).attr('data-session-id') + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(), + ajaxUrl : "?method=getResponses&page={page}&size={size}&{sortList:column}&{filterList:fcol}&isMonitoring=true&isAllowRateAnswers=${qaContent.allowRateAnswers}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $(this).attr('data-session-id') + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(), ajaxProcessing: function (data) { if (data && data.hasOwnProperty('rows')) { var rows = [],