/[drupal]/contributions/modules/storm/stormtimetracking/stormtimetracking.admin.inc
ViewVC logotype

Diff of /contributions/modules/storm/stormtimetracking/stormtimetracking.admin.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.8, Tue May 20 08:13:41 2008 UTC revision 1.9, Tue Jul 1 07:47:43 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: stormtimetracking.admin.inc,v 1.7 2008/05/16 12:58:43 robertogerola Exp $  // $Id: stormtimetracking.admin.inc,v 1.8 2008/05/20 08:13:41 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 85  function stormtimetracking_list() { Line 85  function stormtimetracking_list() {
85      ),      ),
86    );    );
87    
88    $s  = "SELECT n.*,  stt.* FROM {stormtimetracking} stt INNER JOIN {node} n ON n.nid=stt.nid WHERE n.status=1 AND n.type='stormtimetracking' ";    $s = "SELECT n.*,  stt.* FROM {node} n INNER JOIN {stormtimetracking} stt ON n.vid=stt.vid
89      WHERE n.status=1 AND n.type='stormtimetracking' ";
90    
91    $s_duration = "SELECT SUM(duration) FROM {stormtimetracking} stt INNER JOIN {node} n ON n.nid=stt.nid WHERE n.status=1 AND n.type='stormtimetracking' ";    $s_duration = "SELECT SUM(duration) FROM {stormtimetracking} stt INNER JOIN {node} n ON n.nid=stt.nid WHERE n.status=1 AND n.type='stormtimetracking' ";
92    
# Line 121  function stormtimetracking_list() { Line 122  function stormtimetracking_list() {
122      $where[] = 'n.uid='. $trackinguser->uid;      $where[] = 'n.uid='. $trackinguser->uid;
123    }    }
124    
125      $s = db_rewrite_sql($s);
126    $s = stormtimetracking_access_sql($s, $where);    $s = stormtimetracking_access_sql($s, $where);
127    $s = db_rewrite_sql($s, 'stormtimetracking', 'nid');    $s = db_rewrite_sql($s, 'stormtimetracking', 'nid');
128    
# Line 195  function stormtimetracking_list_filter() Line 197  function stormtimetracking_list_filter()
197      '#weight' => -20,      '#weight' => -20,
198    );    );
199    
200    $s = "SELECT n.nid, n.title FROM {stormorganization} sor INNER JOIN {node} n ON sor.nid=n.nid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormorganization} AS sor ON sor.vid=n.vid
201      WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";
202      $s = db_rewrite_sql($s);
203    $r = db_query(stormorganization_access_sql($s));    $r = db_query(stormorganization_access_sql($s));
204    $organizations = array();    $organizations = array();
205    while ($organization = db_fetch_object($r)) {    while ($organization = db_fetch_object($r)) {
# Line 210  function stormtimetracking_list_filter() Line 214  function stormtimetracking_list_filter()
214      '#attributes' => array('onchange' => "stormticket_organization_project_task_tickets(this, 'edit-project-nid', 'edit-task-nid', 'edit-ticket-nid', true, 'All')"),      '#attributes' => array('onchange' => "stormticket_organization_project_task_tickets(this, 'edit-project-nid', 'edit-task-nid', 'edit-ticket-nid', true, 'All')"),
215    );    );
216    
217    $s = "SELECT n.nid, n.title FROM {stormproject} spr INNER JOIN {node} n ON spr.nid=n.nid    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormproject} AS spr ON spr.vid=n.vid
218    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";
219      $s = db_rewrite_sql($s);
220    $r = db_query(stormproject_access_sql($s), $organization_nid);    $r = db_query(stormproject_access_sql($s), $organization_nid);
221    $projects = array();    $projects = array();
222    while ($project = db_fetch_object($r)) {    while ($project = db_fetch_object($r)) {
# Line 239  function stormtimetracking_list_filter() Line 244  function stormtimetracking_list_filter()
244      '#attributes' => array('onchange' => "stormticket_task_tickets(this, 'edit-organization-nid', 'edit-project-nid', 'edit-ticket-nid', true, 'All')"),      '#attributes' => array('onchange' => "stormticket_task_tickets(this, 'edit-organization-nid', 'edit-project-nid', 'edit-ticket-nid', true, 'All')"),
245    );    );
246    
247    $r = db_query(stormticket_access_sql("SELECT n.nid, n.title FROM {stormticket} sti INNER JOIN {node} n ON sti.nid=n.nid WHERE n.status=1 AND n.type='stormticket' AND sti.organization_nid=%d AND sti.project_nid=%d AND sti.task_nid=%d ORDER BY title "), $organization_nid, $project_nid, $task_nid);    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormticket} AS sti
248      ON sti.vid=n.vid WHERE n.status=1 AND n.type='stormticket' AND sti.organization_nid=%d AND sti.project_nid=%d AND sti.task_nid=%d ORDER BY title ";
249      $r = db_query(stormticket_access_sql($s), $organization_nid, $project_nid, $task_nid);
250    $tickets = array();    $tickets = array();
251    while ($ticket = db_fetch_object($r)) {    while ($ticket = db_fetch_object($r)) {
252      $tickets[$ticket->nid] = $ticket->title;      $tickets[$ticket->nid] = $ticket->title;
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9
  ViewVC Help
Powered by ViewVC 1.1.2