Changeset 2741
- Timestamp:
- 02/12/10 20:28:07 (2 years ago)
- Files:
-
- trunk/admin/Public/A2B_entity_config.php (modified) (1 diff)
- trunk/admin/Public/A2B_entity_statuslog.php (modified) (2 diffs)
- trunk/admin/Public/form_data/FG_var_config.inc (modified) (3 diffs)
- trunk/admin/Public/form_data/FG_var_statuslog.inc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/admin/Public/A2B_entity_config.php
r2421 r2741 107 107 108 108 <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center"> 109 110 <tr> 111 <td width="19%" align="left" valign="top" class="bgcolor_004"> 112 <font class="fontstyle_003"> <?php echo gettext("VALUE");?></font> 113 </td> 114 115 <td align="left" class="bgcolor_003"> 116 <table> 117 <tr> 118 <td width="25%" align="left" valign="top"> 119 <input class="form_input_text" name="filterValue" size="20"> 120 </td> 121 122 <td width="10%"> 123 <font class="version"> 124 <input type="radio" NAME="rbValue" value="1" checked> <?php echo gettext("Exact");?> 125 </font> 126 </td> 127 <td width="10%"> 128 <font class="version"> 129 <input type="radio" NAME="rbValue" value="2"> <?php echo gettext("Begins with");?> 130 </font> 131 </td> 132 <td width="10%"> 133 <font class="version"> 134 <input type="radio" NAME="rbValue" value="3"> <?php echo gettext("Contains");?> 135 </font> 136 </td> 137 <td width="10%"> 138 <font class="version"> 139 <input type="radio" NAME="rbValue" value="4"> <?php echo gettext("Ends with");?> 140 </font> 141 </td> 142 </td> 143 </table> 144 </td> 145 </tr> 146 147 <tr> 148 <td width="19%" align="left" valign="top" class="bgcolor_004"> 149 <font class="fontstyle_003"> <?php echo gettext("KEY");?></font> 150 </td> 151 152 <td align="left" class="bgcolor_005"> 153 <table> 154 <tr> 155 <td width="25%" align="left" valign="top"> 156 <input class="form_input_text" name="filterKey" size="20"> 157 </td> 158 159 160 <td width="10%"> 161 <font class="version"> 162 <input type="radio" NAME="rbKey" value="1" checked> <?php echo gettext("Exact");?> 163 </font> 164 </td> 165 <td width="10%"> 166 <font class="version"> 167 <input type="radio" NAME="rbKey" value="2"> <?php echo gettext("Begins with");?> 168 </font> 169 </td> 170 <td width="10%"> 171 <font class="version"> 172 <input type="radio" NAME="rbKey" value="3"> <?php echo gettext("Contains");?> 173 </font> 174 </td> 175 <td width="10%"> 176 <font class="version"> 177 <input type="radio" NAME="rbKey" value="4"> <?php echo gettext("Ends with");?> 178 </font> 179 </td> 180 </td> 181 </table> 182 </td> 183 </tr> 184 185 <tr> 186 <td width="19%" align="left" valign="top" class="bgcolor_004"> 187 <font class="fontstyle_003"> <?php echo gettext("DESCRIPTION");?></font> 188 </td> 189 190 <td align="left" class="bgcolor_003"> 191 <table> 192 <tr> 193 <td width="25%" align="left" valign="top"> 194 <input class="form_input_text" name="filterDescription" size="20"> 195 </td> 196 197 <td width="10%"> 198 <font class="version"> 199 <input type="radio" NAME="rbDesc" value="1" checked> <?php echo gettext("Exact");?> 200 </font> 201 </td> 202 <td width="10%"> 203 <font class="version"> 204 <input type="radio" NAME="rbDesc" value="2"> <?php echo gettext("Begins with");?> 205 </font> 206 </td> 207 <td width="10%"> 208 <font class="version"> 209 <input type="radio" NAME="rbDesc" value="3"> <?php echo gettext("Contains");?> 210 </font> 211 </td> 212 <td width="10%"> 213 <font class="version"> 214 <input type="radio" NAME="rbDesc" value="4"> <?php echo gettext("Ends with");?> 215 </font> 216 </td> 217 </td> 218 </table> 219 </td> 220 </tr> 221 222 109 223 <tr> 110 224 <td width="19%" align="left" valign="top" class="bgcolor_004"> trunk/admin/Public/A2B_entity_statuslog.php
r2421 r2741 68 68 69 69 $HD_Form->create_toppage($form_action); 70 70 71 71 72 ?> … … 214 215 </tr> 215 216 <tr> 217 <td class="bgcolor_004" align="left"> 218 </td> 219 <td class="bgcolor_003" align="left"> 220 <table width="100%" border="0" cellspacing="0" cellpadding="0"> 221 <tr><td class="fontstyle_searchoptions"> 222 223 <select name="status" class="form_input_select"> 224 <?php 225 echo "<OPTION value=\"-1\">" . gettext("SELECT STATUS") . "</option>"; 226 foreach($cardstatus_list as $status){ 227 echo "<OPTION value=\"$status[1]\"> $status[0] </option>"; 228 } 229 ?> 230 </select> 231 </td></tr></table> 232 </td> 233 </tr> 234 235 <tr> 216 236 <td class="bgcolor_004" align="left" > </td> 217 237 trunk/admin/Public/form_data/FG_var_config.inc
r2310 r2741 34 34 35 35 36 getpost_ifset(array('id', 'config_title', 'config_key', 'config_value', 'config_description', 'config_group_title', 'groupselect', ' posted','agi_conf'));36 getpost_ifset(array('id', 'config_title', 'config_key', 'config_value', 'config_description', 'config_group_title', 'groupselect', 'filterKey', 'rbKey', 'filterDescription', 'rbDesc', 'filterValue', 'rbValue', 'posted','agi_conf')); 37 37 38 38 // This will generate agi-confx … … 84 84 $HD_Form -> FG_TABLE_DEFAULT_SENS = "ASC"; 85 85 86 if ($groupselect != " ") {86 if ($groupselect != "-1" && $groupselect != "") { 87 87 $HD_Form = new FormHandler("cc_config", gettext("Configuration")); 88 88 $HD_Form -> FG_TABLE_ID = "id"; … … 90 90 $_SESSION['ss_groupselect'] = $HD_Form -> FG_TABLE_CLAUSE; 91 91 $_SESSION['grpselect'] = $groupselect; 92 } 93 94 if (!empty($filterKey)) { 95 switch ($rbKey) { 96 case 1 : $filterKey = " = '$filterKey'"; break; 97 case 2 : $filterKey = " LIKE '$filterKey%'"; break; 98 case 3 : $filterKey = " LIKE '%$filterKey%'"; break; 99 case 4 : $filterKey = " LIKE '%$filterKey'"; break; 100 } 101 102 $OPL = ''; 103 if ( ($groupselect != "-1") ) { 104 $OPL = 'AND'; 105 } 106 $HD_Form -> FG_TABLE_CLAUSE .= " $OPL config_key $filterKey"; 107 } 108 if (!empty($filterDescription)) { 109 switch ($rbDesc) { 110 case 1 : $filterDescription = " = '$filterDescription'"; break; 111 case 2 : $filterDescription = " LIKE '$filterDescription%'"; break; 112 case 3 : $filterDescription = " LIKE '%$filterDescription%'"; break; 113 case 4 : $filterDescription = " LIKE '%$filterDescription'"; break; 114 } 115 116 $OPL = ''; 117 if ( ($groupselect != "-1") || !empty($filterKey) ) { 118 $OPL = 'AND'; 119 } 120 $HD_Form -> FG_TABLE_CLAUSE .= " $OPL config_description $filterDescription"; 121 } 122 123 if (!empty($filterValue)) { 124 switch ($rbValue) { 125 case 1 : $filterValue = " = '$filterValue'"; break; 126 case 2 : $filterValue = " LIKE '$filterValue%'"; break; 127 case 3 : $filterValue = " LIKE '%$filterValue%'"; break; 128 case 4 : $filterValue = " LIKE '%$filterValue'"; break; 129 } 130 131 $OPL = ''; 132 if ( ($groupselect != "-1") || !empty($filterKey) || !empty($filterDescription) ) { 133 $OPL = 'AND'; 134 } 135 $HD_Form -> FG_TABLE_CLAUSE .= " $OPL config_value $filterValue"; 92 136 } 93 137 trunk/admin/Public/form_data/FG_var_statuslog.inc
r2310 r2741 34 34 35 35 36 getpost_ifset(array('id', 'status', 'id_cc_card', 'updated_date', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday', 'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday', 'st itle', 'atmenu', 'current_page', 'order', 'sens','popup_select'));36 getpost_ifset(array('id', 'status', 'id_cc_card', 'updated_date', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday', 'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday', 'status', 'stitle', 'atmenu', 'current_page', 'order', 'sens','popup_select')); 37 37 38 38 … … 76 76 } 77 77 78 if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0 && strlen($id_cc_card)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";79 80 78 if ($id_cc_card != "") { 79 if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) 80 $HD_Form -> FG_TABLE_CLAUSE.=" AND "; 81 81 $HD_Form -> FG_TABLE_CLAUSE.=" sl.id_cc_card = '$id_cc_card'"; 82 82 } 83 83 84 $cardstatus_list = array(); 85 $cardstatus_list["0"] = array( gettext("CANCELLED"), "0"); 86 $cardstatus_list["1"] = array( gettext("ACTIVE"), "1"); 87 $cardstatus_list["2"] = array( gettext("NEW"), "2"); 88 $cardstatus_list["3"] = array( gettext("WAITING-MAILCONFIRMATION"), "3"); 89 $cardstatus_list["4"] = array( gettext("RESERVED"), "4"); 90 $cardstatus_list["5"] = array( gettext("EXPIRED"), "5"); 91 $cardstatus_list["6"] = array( gettext("SUSPENDED FOR UNDERPAYMENT"), "6"); 92 $cardstatus_list["7"] = array( gettext("SUSPENDED FOR LITIGATION"), "7"); 84 if ($status >= 0) { 85 if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) 86 $HD_Form -> FG_TABLE_CLAUSE.=" AND "; 93 87 88 $HD_Form -> FG_TABLE_CLAUSE.=" sl.status = '$status'"; 89 } 90 91 $cardstatus_list = Constants::getCardStatus_List(); 94 92 95 93 $HD_Form -> AddViewElement(gettext("ID CARD"), "id_cc_card", "10%", "center", "sort");
