Assembla home | Assembla project page
 

Changeset 1092

Show
Ignore:
Timestamp:
10/05/08 18:57:44 (2 months ago)
Author:
Pernod
Message:

Added viewed status icons to the TV programme selection page.

Sub-categories can now be used with TV media type.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/swisscenter/base/list_picker.class.php

    r1049 r1092  
    3030   
    3131  function link_url($item) 
     32  { 
     33    return ''; 
     34  } 
     35   
     36  function icon($item) 
    3237  { 
    3338    return ''; 
    …… 
    104109     
    105110      foreach ($data as $item) 
    106         $this->menu->add_item($this->display_format_name($item), $this->link_url($item), true); 
     111        $this->menu->add_item($this->display_format_name($item), $this->link_url($item), true, $this->icon($item)); 
    107112     
    108113      $this->menu->display( 1, 480 ); 

  • trunk/swisscenter/tv.php

    r880 r1092  
    2929      $this->back_url = 'index.php'; 
    3030    else 
    31       $this->back_url = 'tv.php'; 
     31    { 
     32      if ($_REQUEST["cat"] <= 0) 
     33        $this->back_url = "tv.php?subcat=".abs($_REQUEST["cat"]); 
     34      else 
     35        $this->back_url = "tv.php?subcat=".db_value("select parent_id from categories where cat_id=".$_REQUEST["cat"]); 
     36    } 
    3237  } 
    3338   
    …… 
    3742  } 
    3843 
     44  function icon($item) 
     45  { 
     46    $viewed_sql = "select concat( sum(if(v.total_viewings>0,1,0)),':',count(*) ) view_status from tv media ".viewed_join(MEDIA_TYPE_TV); 
     47    $viewed = explode(':',db_value($viewed_sql." where programme='$item'")); 
     48    return viewed_icon($viewed[0], $viewed[1]); 
     49  } 
     50 
    3951  function data_list( $search_string, $start, $end) 
    4052  { 
    4153    $sql = "select distinct programme  
    42               from tv media ".get_rating_join()."  
     54              from tv media ".get_rating_join().viewed_join(MEDIA_TYPE_TV)."  
    4355             where programme like '$search_string' 
    4456                   ".get_rating_filter()." 
    4557                   ".category_select_sql($_REQUEST["cat"], MEDIA_TYPE_TV)." 
    46           order by 1  
    47             limit $start,$end"; 
     58            having ".viewed_status_predicate( filter_get_name() )." 
     59          order by 1 limit $start,$end"; 
    4860     
    4961    return db_col_to_list($sql); 
    …… 
    5365  { 
    5466    $sql = "select count(distinct programme)  
    55               from tv media ".get_rating_join()."  
     67              from tv media ".get_rating_join().viewed_join(MEDIA_TYPE_TV)."  
    5668             where programme like '$search_string' 
    5769                   ".get_rating_filter()." 
    58                    ".category_select_sql($_REQUEST["cat"], MEDIA_TYPE_TV); 
     70                   ".category_select_sql($_REQUEST["cat"], MEDIA_TYPE_TV)." 
     71            having ".viewed_status_predicate( filter_get_name() ); 
    5972        
    6073    return db_value($sql); 
    …… 
    6477  { 
    6578    $sql = " select distinct upper(substring( programme,".(strlen($search_string)).",1))  
    66                from tv media ".get_rating_join()."  
     79               from tv media ".get_rating_join().viewed_join(MEDIA_TYPE_TV)."  
    6780              where programme like '$search_string'  
    6881                   ".get_rating_filter()." 
    6982                   ".category_select_sql($_REQUEST["cat"], MEDIA_TYPE_TV)." 
     83            having ".viewed_status_predicate( filter_get_name() )." 
    7084           order by 1"; 
    7185     
    …… 
    111125  $page->display(); 
    112126} 
    113 else  
     127else 
    114128{ 
    115129  page_header( str('WATCH_TV') , '','',1,false,'',MEDIA_TYPE_TV); 
    116   display_categories('tv.php', MEDIA_TYPE_TV ); 
     130  if ( isset($_REQUEST["subcat"]) ) 
     131    display_categories('tv.php', MEDIA_TYPE_TV, $_REQUEST["subcat"]); 
     132  else 
     133    display_categories('tv.php', MEDIA_TYPE_TV); 
    117134}   
    118135