Changeset 909

Show
Ignore:
Timestamp:
07/29/08 07:52:56 (4 months ago)
Author:
rach
Message:

Add search criteria by caller id for the cards

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/admin/Public/form_data/FG_var_card.inc

    r898 r909  
    1010 
    1111 
    12 $HD_Form = new FormHandler("cc_card","Card"); 
     12$HD_Form = new FormHandler(" cc_card LEFT JOIN cc_callerid ON cc_card.id=cc_callerid.id_cc_card","Card"); 
    1313$HD_Form -> FG_DEBUG = 0; 
    14 $HD_Form -> FG_TABLE_ID="id"; 
     14$HD_Form -> FG_TABLE_ID="cc_card.id"; 
     15$HD_Form ->FG_EDITION_CLAUSE = " cc_card.id='%id' ";; 
    1516$HD_Form -> FG_TABLE_DEFAULT_SENS = "ASC"; 
    1617$HD_Form -> FG_FILTER_SEARCH_SESSION_NAME = 'entity_card_selection'; 
    17  
    1818$HD_Form -> FG_FK_DELETE_CONFIRM = true; 
    1919$HD_Form -> FG_FK_DELETE_ALLOWED = true; 
    …… 
    149149 
    150150 
    151 $HD_Form -> AddViewElement(gettext("ID"), "id", "3%", "center", "sort"); 
     151$HD_Form -> AddViewElement(gettext("ID"), "cc_card.id", "3%", "center", "sort"); 
    152152if(stristr($_SERVER['REQUEST_URI'], 'A2B_entity_card_multi.php')) 
    153153        $HD_Form -> AddViewElement(gettext("TAG"), "tag", "11%", "center", "sort"); 
    …… 
    168168        $HD_Form -> AddViewElement("<acronym title=\"AMOUNT OF CALL DONE\">".gettext("ACD")."</acronym>", "nbused", "4%", "center", "sort"); 
    169169        if(stristr($_SERVER['REQUEST_URI'], 'A2B_entity_card_multi.php')) { 
    170                 $FG_COL_QUERY='id, tag, username, useralias, lastname,id_group, credit, tariff, status, language, inuse, currency, sip_buddy, iax_buddy, nbused'; 
     170                $FG_COL_QUERY='DISTINCT cc_card.id, tag, username, useralias, lastname,id_group, credit, tariff, status, language, inuse, currency, sip_buddy, iax_buddy, nbused'; 
    171171        } else { 
    172                 $FG_COL_QUERY='id, username, useralias, lastname,id_group, credit, tariff, status, language, inuse, currency, sip_buddy, iax_buddy, nbused '; 
     172                $FG_COL_QUERY='DISTINCT cc_card.id, username, useralias, lastname,id_group, credit, tariff, status, language, inuse, currency, sip_buddy, iax_buddy, nbused '; 
    173173        } 
    174174}else{ 
    175         $FG_COL_QUERY='id, username, lastname, id_group, credit'; 
     175        $FG_COL_QUERY='DISTINCT cc_card.id, username, lastname, id_group, credit'; 
    176176} 
    177177 
    …… 
    209209$HD_Form -> AddSearchElement_C1(gettext("LASTNAME"),'lastname','lastnametype'); 
    210210$HD_Form -> AddSearchElement_C1(gettext("CARDALIAS"),'useralias','useraliastype'); 
     211$HD_Form -> AddSearchElement_C1(gettext("CALLER ID"),'cid','cidtype'); 
    211212$HD_Form -> AddSearchElement_C1(gettext("MACADDRESS"),'mac_addr','macaddresstype'); 
    212 $HD_Form -> AddSearchElement_C2(gettext("CARDID (SERIAL)"),'id1','id1type','id2','id2type','id'); 
     213$HD_Form -> AddSearchElement_C2(gettext("CARDID (SERIAL)"),'id1','id1type','id2','id2type','cc_card.id'); 
    213214$HD_Form -> AddSearchElement_C2(gettext("CREDIT"),'credit1','credit1type','credit2','credit2type','credit'); 
    214215$HD_Form -> AddSearchElement_C2(gettext("INUSE"),'inuse1','inuse1type','inuse2','inuse2type','inuse'); 


Google