Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v diff -u -r1.77.2.6 -r1.77.2.7 --- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 16 Feb 2007 13:00:03 -0000 1.77.2.6 +++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 18 Feb 2007 22:12:40 -0000 1.77.2.7 @@ -1,5 +1,5 @@ - + Above Absolute Size @@ -34,7 +34,7 @@ Add new question: Open Question Add new question: Short Answer Add items to section - Insert new question + Add a new question Add new Action Add a new section Add new section display @@ -462,6 +462,7 @@ Manage another assessment Other Sessions Out of + Page %current% of %total% Description Query Type @@ -471,6 +472,7 @@ Enter assessment password Percent Score Percentage of the points of the question this choice gives. May be larger than 100 and lower than -100. + Percentage complete Performed Permissions Please select one @@ -485,8 +487,7 @@ Prepend Empty Item Preview <a href="../assessment?assessment_id=%assessment_id%">Preview</a> (your response will be recorded) - Status - Status + Publish Status Query Question Question not answered @@ -541,7 +542,7 @@ Save and finish Score Search - Search for question + Search for questions Search and add questions to section "%section_title%" Search Results Search for sections @@ -562,7 +563,7 @@ Section Navigation -- New -- Number of questions per page - Section %sections.rownum% + Section %sections.sort_order% Order of questions In which order will the questions be displayed in this section. Preview Section Index: openacs-4/packages/assessment/lib/feedback.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.adp,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/assessment/lib/feedback.adp 5 Feb 2007 14:10:42 -0000 1.3.2.1 +++ openacs-4/packages/assessment/lib/feedback.adp 18 Feb 2007 22:12:41 -0000 1.3.2.2 @@ -4,7 +4,7 @@

@assessment_data.html_title;noquote@: Feedback

 - +
@@ -14,6 +14,6 @@

- Next +

Index: openacs-4/packages/assessment/lib/feedback.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/assessment/lib/feedback.tcl 5 Feb 2007 14:10:42 -0000 1.5.2.1 +++ openacs-4/packages/assessment/lib/feedback.tcl 18 Feb 2007 22:12:41 -0000 1.5.2.2 @@ -30,15 +30,7 @@ #if {![info exists no_complain]} { # ad_return_complaint 1 "feedback! [ns_conn query]" #} -set subject_id [ad_conn user_id] -as::assessment::data -assessment_id $assessment_id -permission::require_permission -object_id $assessment_id -privilege read -set page_title "[_ assessment.Show_Items]" -set context [list $page_title] -ns_log notice "feedback.tcl '${next_url}' '${return_url}'" -set section_title [db_string section_title "select title from cr_revisions where revision_id=:section_id"] - if { $next_url eq "" } { if { $return_p && [exists_and_not_null return_url] } { set next_url $return_url @@ -48,6 +40,21 @@ } } +ad_form -name next -export {next_url assessment_id section_id session_id} -form { + {next_button:text(submit) {label "[_ assessment.Next]"}} +} -on_submit { + ad_returnredirect $next_url +} + +set subject_id [ad_conn user_id] +as::assessment::data -assessment_id $assessment_id +permission::require_permission -object_id $assessment_id -privilege read +set page_title "[_ assessment.Show_Items]" +set context [list $page_title] + + +set section_title [db_string section_title "select title from cr_revisions where revision_id=:section_id"] + if {[info exists assessment_id]} { # check if this assessment even allows feedback if not, bail out @@ -56,3 +63,10 @@ ad_script_abort } } + +# we already finished the page, we are just looking at the feedback +# so we are at the next page +if {[info exists current_page]} { + set finished_page $current_page +} + Index: openacs-4/packages/assessment/lib/progress-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/Attic/progress-bar.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/assessment/lib/progress-bar.adp 16 Feb 2007 02:06:10 -0000 1.1.2.2 +++ openacs-4/packages/assessment/lib/progress-bar.adp 18 Feb 2007 22:12:41 -0000 1.1.2.3 @@ -1,8 +1,8 @@ - - + +
Percentage completePage @current@ of @total@#assessment.Percentage_complete##assessment.Page_current_of_total#
Index: openacs-4/packages/assessment/lib/progress-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/Attic/progress-bar.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/assessment/lib/progress-bar.tcl 16 Feb 2007 02:06:10 -0000 1.1.2.2 +++ openacs-4/packages/assessment/lib/progress-bar.tcl 18 Feb 2007 22:12:41 -0000 1.1.2.3 @@ -40,6 +40,9 @@ if { ($total == 0) || [string is true $finish] } { set percentage_done 100 +} elseif {[info exists finished_page] && $finished_page == $current} { + # subtract 1 from current, since we haven't completed this page yet + set percentage_done [expr {round($current * 100.0 / $total)}] } else { # subtract 1 from current, since we haven't completed this page yet set percentage_done [expr {round(($current - 1) * 100.0 / $total)}]