Index: openacs-4/packages/project-manager/www/rate-project.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/rate-project.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/rate-project.adp	1 Aug 2005 19:34:12 -0000	1.2
+++ openacs-4/packages/project-manager/www/rate-project.adp	8 Aug 2005 16:33:52 -0000	1.3
@@ -1,6 +1,65 @@
 <master>
-<property name="title">@title;noquote@</property>
+<property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
 
-<formtemplate id="rate_project"></formtemplate>
+<formtemplate id="rate_project">
+<table border="0">
+<tr>
+   <td>
+       &nbsp;
+   </td>
+   <multiple name="dimensions">
+       <th align="center">
+           @dimensions.title@
+       </th>
+       <td>
+           &nbsp;&nbsp;&nbsp;&nbsp;
+       </td>
+   </multiple>
+</tr>	
+   <multiple name="assignees">
+       <tr>
+           <if @assignees.rownum@ eq 1>
+               <td class="form-label">
+                   <br>@assignees.label@ <span class="form-required-mark">*</span>
+               </td>	
+           </if>
+           <else>
+               <td class="form-label">
+                   @assignees.label@ <span class="form-required-mark">*</span>
+               </td>	
+           </else>
+           <multiple name="dimensions">
+               <td>
+	           <table border="0">
+	           <tr>
+                      <formgroup id="@assignees.party_id@.@dimensions.dimension_key@">
+	                  <th align="center">
+                             <if @assignees.rownum@ eq 1>
+                                 @formgroup.label;noquote@<br>
+                             </if>
+                             @formgroup.widget;noquote@
+                          </th>
+	              </formgroup>
+	           </tr>
+	           </table>
+               </td>
+               <td>
+                   &nbsp;
+               </td>	
+           </multiple>
+       </tr>
+   </multiple>
+<tr>
+    <td>
+        &nbsp;
+    </td>
+    <td>
+        <input type=submit value="#project-manager.rate#">
+    </td>
+</tr>
+</table>
+</formtemplate>
+
+
Index: openacs-4/packages/project-manager/www/rate-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/rate-project.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/rate-project.tcl	1 Aug 2005 19:34:12 -0000	1.2
+++ openacs-4/packages/project-manager/www/rate-project.tcl	8 Aug 2005 16:33:52 -0000	1.3
@@ -10,8 +10,8 @@
     project_item_id:integer,notnull
 }
 
-set title [_ project-manager.rate_this_project]
-set context [list [list "one?project_id=$project_id" "One Project"] $title]
+set page_title [_ project-manager.rate_this_project]
+set context [list [list "one?project_id=$project_id" "One Project"] $page_title]
 
 set user_id [ad_conn user_id]
 set context_object_id $project_id
@@ -28,24 +28,37 @@
 
 # We are going to create an element for each dimension-user pair to evaluate this project    
 # First we get all users assigned to this project
-set users_list [pm::project::assignee_role_list -project_item_id $project_item_id]
+#set users_list [pm::project::assignee_role_list -project_item_id $project_item_id]
+set users_list [list]
+db_multirow -extend { label } assignees get_assignees { } {
+    set assignee_id $party_id
+    acs_user::get -user_id $assignee_id -array user_info
+    set role [pm::role::name -role_id $role_id]
+    set label "$user_info(first_names) $user_info(last_name) ($role):"
+    lappend users_list [list $party_id $label]
+}
 
 # Now we get all the dimensions that for the rating
-set dimensions_list [ratings::get_available_dimensions]
+set dimensions_list [list]
+db_multirow dimensions get_dimensions_list { } {
+    lappend dimensions_list [list "$dimension_key" $title]
+}
 
+#set dimensions_list [ratings::get_available_dimensions]
+
 # We keep a list of all created elements
 set created_elements [list]
 
 # We generate the form
-foreach user $users_list {
-    foreach dimension $dimensions_list {
+foreach dimension $dimensions_list {
+    foreach user $users_list {
 	set assignee_id [lindex $user 0]
-	acs_user::get -user_id $assignee_id -array user_info
-	set role [pm::role::name -role_id [lindex $user 1]]
+	set label [lindex $user 1]
 	ad_form -extend -name rate_project -form [ratings::dimension_ad_form_element -object_id $assignee_id \
 						      -dimension_key [lindex $dimension 0] \
-						      -section "{[_ project-manager.rate] $user_info(first_names) $user_info(last_name) ($role):}" \
-						      -label "[lindex $dimension 1]:"]
+						      -section  "[lindex $dimension 1]:" \
+						      -label "{$label}" \
+						      -show_stars_p "f"]
 	lappend created_elements "${assignee_id}.[lindex $dimension 0]"
     }
 }
Index: openacs-4/packages/project-manager/www/rate-project.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/rate-project.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/www/rate-project.xql	1 Aug 2005 19:34:12 -0000	1.1
+++ openacs-4/packages/project-manager/www/rate-project.xql	8 Aug 2005 16:37:24 -0000	1.2
@@ -9,4 +9,26 @@
     </querytext>
 </fullquery>
 
+<fullquery name="get_assignees">
+    <querytext>	
+	select	
+	        party_id,
+	        role_id
+        from
+        	pm_project_assignment a
+	where
+        	project_id = :project_item_id
+    </querytext>
+</fullquery>
+
+<fullquery name="get_dimensions_list">
+    <querytext>	
+	select 
+		dimension_key, 
+		title 
+	from 
+		rating_dimensions 
+    </querytext>
+</fullquery>
+
 </queryset>
\ No newline at end of file