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

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

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

revision 1.1, Wed Jun 11 12:50:11 2008 UTC revision 1.2, Tue Jul 1 07:47:42 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id$  // $Id: stormexpense.admin.inc,v 1.1 2008/06/11 12:50:11 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 85  function stormexpense_list() { Line 85  function stormexpense_list() {
85      ),      ),
86    );    );
87    
88    $s  = "SELECT n.*,  sex.* FROM {stormexpense} sex INNER JOIN {node} n ON n.nid=sex.nid WHERE n.status=1 AND n.type='stormexpense' ";    $s  = "SELECT n.*,  sex.* FROM {node} AS n INNER JOIN {stormexpense} AS sex ON n.vid=sex.vid
89      WHERE n.status=1 AND n.type='stormexpense' ";
90    
91    $s_totals = "SELECT SUM(amount) AS t_amount, SUM(vat) AS t_vat, SUM(total) AS t_total FROM {stormexpense} sex INNER JOIN {node} n ON n.nid=sex.nid WHERE n.status=1 AND n.type='stormexpense' ";    $s_totals = "SELECT SUM(amount) AS t_amount, SUM(vat) AS t_vat, SUM(total) AS t_total FROM
92      {node} AS n INNER JOIN {stormexpense} AS sex ON n.vid=sex.vid WHERE n.status=1 AND n.type='stormexpense' ";
93    
94    if ($_SESSION['stormexpense_list_filter']['organization_nid']) {    if ($_SESSION['stormexpense_list_filter']['organization_nid']) {
95      $where[] = 'sex.organization_nid='. $_SESSION['stormexpense_list_filter']['organization_nid'];      $where[] = 'sex.organization_nid='. $_SESSION['stormexpense_list_filter']['organization_nid'];
# Line 128  function stormexpense_list() { Line 130  function stormexpense_list() {
130      $where[] = 'n.uid='. $expenseuser->uid;      $where[] = 'n.uid='. $expenseuser->uid;
131    }    }
132    
133      $s = db_rewrite_sql($s);
134    $s = stormexpense_access_sql($s, $where);    $s = stormexpense_access_sql($s, $where);
   $s = db_rewrite_sql($s, 'stormexpense', 'nid');  
135    
136    $tablesort = tablesort_sql($header);    $tablesort = tablesort_sql($header);
137    $r = pager_query($s . $tablesort, $itemsperpage, 0, NULL);    $r = pager_query($s . $tablesort, $itemsperpage, 0, NULL);
# Line 141  function stormexpense_list() { Line 143  function stormexpense_list() {
143      $expenses[] = $item;      $expenses[] = $item;
144    }    }
145    
146      $s_totals = db_rewrite_sql($s_totals);
147    $r = db_query(stormexpense_access_sql($s_totals, $where));    $r = db_query(stormexpense_access_sql($s_totals, $where));
148    $totals = db_fetch_object($r);    $totals = db_fetch_object($r);
149    
# Line 193  function stormexpense_list_filter() { Line 196  function stormexpense_list_filter() {
196      '#weight' => -20,      '#weight' => -20,
197    );    );
198    
199    $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
200      sor.vid=n.vid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";
201      $s = db_rewrite_sql($s);
202    $r = db_query(stormorganization_access_sql($s));    $r = db_query(stormorganization_access_sql($s));
203    $organizations = array();    $organizations = array();
204    while ($organization = db_fetch_object($r)) {    while ($organization = db_fetch_object($r)) {
# Line 208  function stormexpense_list_filter() { Line 213  function stormexpense_list_filter() {
213      '#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')"),
214    );    );
215    
216    $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
217    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";
218      $s = db_rewrite_sql($s);
219    $r = db_query(stormproject_access_sql($s), $organization_nid);    $r = db_query(stormproject_access_sql($s), $organization_nid);
220    $projects = array();    $projects = array();
221    while ($project = db_fetch_object($r)) {    while ($project = db_fetch_object($r)) {
# Line 237  function stormexpense_list_filter() { Line 243  function stormexpense_list_filter() {
243      '#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')"),
244    );    );
245    
246    $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 ON sti.vid=n.vid
247      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 ";
248      $s = db_rewrite_sql($s);
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.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.2