[phpwebapp-commits] CVS: top10/templates/proj_details proj_details.php,1.1.1.1,1.2 proj_details.html,1.1.1.1,1.2 proj_details.db,1.1.1.1,1.2

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/top10/templates/proj_details
In directory sc8-pr-cvs1:/tmp/cvs-serv24770/templates/proj_details

Modified Files:
	proj_details.php proj_details.html proj_details.db 
Log Message:


Index: proj_details.php
===================================================================
RCS file: /cvsroot/phpwebapp/top10/templates/proj_details/proj_details.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** proj_details.php	23 Sep 2003 14:04:14 -0000	1.1.1.1
--- proj_details.php	24 Sep 2003 14:01:36 -0000	1.2
***************
*** 28,38 ****
      }
  
    function onRender()
      {
        $proj_id = $this->getSVar("proj_id");
!       $params = array("proj_id" => $proj_id);
!       $rs = WebApp::openRS("project", $params);
        $proj_data = $rs->Fields();
!       WebApp::addVars($proj_data);
      }
  }
--- 28,54 ----
      }
  
+   function on_set_project($event_args)
+     {
+       $proj_id = $event_args["proj_id"];
+       $this->setSVar("proj_id", $proj_id);
+     }
+ 
    function onRender()
      {
+       $this->add_project_data();
+     }
+ 
+   function add_project_data()
+     {
        $proj_id = $this->getSVar("proj_id");
!       if ($proj_id==UNDEFINED)
!         {
!           WebApp::addVar("proj_id", "UNDEFINED");
!           return;
!         }
! 
!       $rs = WebApp::openRS("get_project_data", compact("proj_id"));
        $proj_data = $rs->Fields();
!       WebApp::addVars($proj_data);      
      }
  }

Index: proj_details.html
===================================================================
RCS file: /cvsroot/phpwebapp/top10/templates/proj_details/proj_details.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** proj_details.html	23 Sep 2003 14:04:14 -0000	1.1.1.1
--- proj_details.html	24 Sep 2003 14:01:36 -0000	1.2
***************
*** 1,27 ****
  <WebBox ID="proj_details">
!   <h2>{{proj_name}} 
!   ( <a href="http://sourceforge.net/projects/{{proj_id}}" target="_blank">{{proj_id}}</a> 
!   / {{group_id}} )</h2>
    <table cellspacing="1" cellpadding="2" bgcolor="#dddddd">
      <tr>
!       <td bgcolor="eeeeee">License</td>
!       <td bgcolor="#ffffff">{{license}}</td>
!     </tr>
!     <tr>
!       <td bgcolor="eeeeee">Language</td>
!       <td bgcolor="#ffffff">{{prog_lang}}</td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee" nowrap>Register Date</td>
!       <td bgcolor="#ffffff">{{register_date}}</td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee">Members</td>
!       <td bgcolor="#ffffff">{{members}}</td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee">Description</td>
!       <td bgcolor="#ffffff">{{proj_descr}}</td>
      </tr>
    </table>
  </WebBox>
--- 1,47 ----
  <WebBox ID="proj_details">
!   <Include SRC="{{./}}header.html" />
! 
!   <If condition="'{{proj_id}}'<>'UNDEFINED'">
    <table cellspacing="1" cellpadding="2" bgcolor="#dddddd">
      <tr>
!       <td bgcolor="eeeeee" nowrap>General Info:</td>
!       <td bgcolor="#ffffff">
!         <table width="100%" cellspacing="0" cellpadding="0">
!           <tr>
!             <td align="right">License:</td>
!             <td>&nbsp;{{license}}</td>
!             <td align="right">Language:</td>
!             <td>&nbsp;{{prog_lang}}</td>
!             <td align="right">Register Date:</td>
!             <td>&nbsp;{{register_date}}</td>
!             <td align="right">Points:</td>
!             <td>&nbsp;{{points}}</td>
!           </tr>
!         </table>
!       </td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee">Description:</td>
!       <td bgcolor="#ffffff">{{proj_descr}}</td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee">Members:</td>
!       <td bgcolor="#ffffff">
!         <Include SRC="{{./}}members.html" />
!       </td>
      </tr>
      <tr>
!       <td bgcolor="eeeeee">Evaluators:</td>
!       <td bgcolor="#ffffff">
!         <Repeat rs="evaluators">
!           <a href="javascript:preference_list('{{username}}')">{{username}}</a>
!           ({{points}}),
!         </Repeat>
!       </td>
      </tr>
    </table>
+   <br><br>
+ 
+   <Include SRC="{{./}}comments/comments.html" />
+   </If>
  </WebBox>

Index: proj_details.db
===================================================================
RCS file: /cvsroot/phpwebapp/top10/templates/proj_details/proj_details.db,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** proj_details.db	23 Sep 2003 14:04:14 -0000	1.1.1.1
--- proj_details.db	24 Sep 2003 14:01:36 -0000	1.2
***************
*** 1,8 ****
  <!--# -*-SQL-*- #tell emacs to use SQL mode #-->
  
! <Recordset ID="project">
    <Query>
      SELECT * FROM proj_list
      WHERE proj_id = '{{proj_id}}'
    </Query>
  </Recordset>
--- 1,38 ----
  <!--# -*-SQL-*- #tell emacs to use SQL mode #-->
  
! <Recordset ID="get_project_data">
    <Query>
      SELECT * FROM proj_list
      WHERE proj_id = '{{proj_id}}'
+   </Query>
+ </Recordset>
+ 
+ <!--# members of the project #-->
+ <Recordset ID="members">
+   <Query>
+     SELECT username FROM proj_members
+     WHERE proj_id = '{{proj_id}}'
+   </Query>
+ </Recordset>
+ 
+ <!--# projects evaluated by each member #-->
+ <Recordset ID="evaluations" type="DynamicRS">
+   <Query>
+     SELECT proj_id
+     FROM preference_list
+     WHERE username = '{{username}}'
+       AND position < 10
+     ORDER BY position
+   </Query>
+ </Recordset>
+ 
+ <!--# users that have evaluated this project and the points given to it #-->
+ <Recordset ID="evaluators">
+   <Query>
+     SELECT username, (10 - position) AS points 
+     FROM preference_list
+     WHERE proj_id = '{{proj_id}}'
+       AND position < 10
+     ORDER BY position
    </Query>
  </Recordset>