- Added Simple Survey report

www/index.tcl

@@ -9,6 +9,7 @@ ad_page_contract {
     @cvs-id  $Id$
 } {
     related_object_id:integer,optional
+    related_context_id:integer,optional
     { return_url "" }
 } -properties {
     surveys:multirow
@@ -29,7 +30,7 @@ db_multirow -extend {survey_url} surveys survey_select {
     and enabled_p = 't'
     order by upper(name)
 } {
-    set survey_url [export_vars -base "one" {survey_id related_object_id return_url}]
+    set survey_url [export_vars -base "one" {survey_id related_object_id related_context_id return_url}]
 }
 
 db_release_unused_handles

www/one.adp

 <master>
 <property name=title>One Survey: @name;noquote@</property>
 <property name="context">@context;noquote@</property>
+<br>
+@project_menu;noquote@
 
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <form enctype=multipart/form-data method="post" action="process-response">
+<if "" ne @message@>
+@message;noquote@
+</if>
+
+<h1><%= [lang::message::lookup "" simple-survey.Fill_out_survey "Fill out Survey"] %><h1>
+
+<p>
+@description;noquote@
+</p>
+
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <form enctype=multipart/form-data method="post" action="process-response">
 	<%= [export_form_vars return_url ] %>
-        <tr>
-          <td class="tabledata">@description;noquote@</td>
-        </tr>
-        
-        <tr>
-          <td class="tabledata"><hr noshade size="1" color="#dddddd"></td>
-        </tr>
-        
-        <tr>
-          <td class="tabledata">
-            <%= [export_form_vars survey_id related_object_id] %>
-            <include src=one_@display_type;noquote@ questions=@questions;noquote@>
-            <hr noshapde size="1" color="#dddddd">
-              <input type=submit value="Continue">
-          </td>
-        </tr>
-        
-      </form>
-    </table>
+    <tr>
+      <td class="tabledata"><hr noshade size="1" color="#dddddd"></td>
+    </tr>
+    
+    <tr>
+      <td class="tabledata">
+        <%= [export_form_vars survey_id related_object_id related_context_id] %>
+        <include src=one_@display_type;noquote@ questions=@questions;noquote@>
+        <hr noshapde size="1" color="#dddddd">
+          <input type=submit value="Continue">
+      </td>
+    </tr>
+    
+  </form>
+</table>

www/one.tcl

@@ -10,10 +10,12 @@ ad_page_contract {
     @cvs-id $Id$
 
 } {
-  
     survey_id:integer,notnull
     { related_object_id:integer "" }
+    { related_context_id:integer "" }
     return_url:optional
+    { message "" }
+    { project_id 0 }
 
 } -validate {
     survey_exists -requires {survey_id} {
@@ -99,8 +101,13 @@ if ![info exists return_url] {
     set return_url {}
 }
 
+set project_menu ""
 
-db_release_unused_handles
-
-ad_return_template
+if {0 != $project_id} {
+    set menu_label "project_summary"
+    set bind_vars [ns_set create]
+    ns_set put $bind_vars project_id $project_id
+    set parent_menu_id [db_string parent_menu "select menu_id from im_menus where label='project'" -default 0]
+    set project_menu [im_sub_navbar $parent_menu_id $bind_vars "" "pagedesriptionbar" $menu_label]
+}
 

www/process-response.tcl

@@ -17,6 +17,7 @@ ad_page_contract {
 
   survey_id:integer,notnull
   { related_object_id:integer "" }
+  { related_context_id:integer "" }
   return_url:optional
   response_to_question:array,optional,multiple,html
 
@@ -149,7 +150,8 @@ db_transaction {
    
     db_dml update_oid "
 	update survsimp_responses set
-		related_object_id = :related_object_id
+		related_object_id = :related_object_id,
+		related_context_id = :related_context_id
 	where response_id = :response_id
     "