Changeset 22138 for branches/version-2_12-dev
- Timestamp:
- 2012/12/15 19:08:08 (11 years ago)
- Location:
- branches/version-2_12-dev/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/Smarty/templates/admin/total/index.tpl
r22003 r22138 32 32 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 33 33 <input type="hidden" name="mode" value="search" /> 34 <input type="hidden" name=" form" value="1" />34 <input type="hidden" name="search_form" value="1" /> 35 35 <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> 36 36 <input type="hidden" name="type" value="<!--{$smarty.post.type|h}-->" /> … … 55 55 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 56 56 <input type="hidden" name="mode" value="search" /> 57 <input type="hidden" name=" form" value="2" />57 <input type="hidden" name="search_form" value="2" /> 58 58 <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> 59 59 <input type="hidden" name="type" value="<!--{$smarty.post.type|h}-->" /> … … 99 99 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 100 100 <input type="hidden" name="mode" value="search" /> 101 <input type="hidden" name="form" value="<!--{$arrForm.form.value|h}-->" />102 101 <input type="hidden" name="type" value="<!--{$arrForm.type.value|h}-->" /> 103 102 <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> … … 117 116 <div id="graph-image"> 118 117 <!--{* <img src="<!--{$tpl_image}-->?<!--{$cashtime}-->" alt="グラフ"> *}--> 119 <img src="?draw_image=true&type=<!--{$smarty.post.type|h}-->&mode=search& page=<!--{$smarty.post.page|h}-->&search_startyear_m=<!--{$smarty.post.search_startyear_m|h}-->&search_startmonth_m=<!--{$smarty.post.search_startmonth_m|h}-->&search_startyear=<!--{$smarty.post.search_startyear|h}-->&search_startmonth=<!--{$smarty.post.search_startmonth|h}-->&search_startday=<!--{$smarty.post.search_startday|h}-->&search_endyear=<!--{$smarty.post.search_endyear|h}-->&search_endmonth=<!--{$smarty.post.search_endmonth|h}-->&search_endday=<!--{$smarty.post.search_endday|h}-->" alt="グラフ" />118 <img src="?draw_image=true&type=<!--{$smarty.post.type|h}-->&mode=search&search_form=<!--{$smarty.post.search_form|h}-->&page=<!--{$smarty.post.page|h}-->&search_startyear_m=<!--{$smarty.post.search_startyear_m|h}-->&search_startmonth_m=<!--{$smarty.post.search_startmonth_m|h}-->&search_startyear=<!--{$smarty.post.search_startyear|h}-->&search_startmonth=<!--{$smarty.post.search_startmonth|h}-->&search_startday=<!--{$smarty.post.search_startday|h}-->&search_endyear=<!--{$smarty.post.search_endyear|h}-->&search_endmonth=<!--{$smarty.post.search_endmonth|h}-->&search_endday=<!--{$smarty.post.search_endday|h}-->" alt="グラフ" /> 120 119 </div> 121 120 <!--{/if}--> -
branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
r22093 r22138 113 113 // パラメーター情報の初期化 114 114 $this->lfInitParam($objFormParam); 115 $objFormParam->setParam($_POST); 116 $objFormParam->setParam($_GET); 115 $objFormParam->setParam($_REQUEST); 117 116 118 117 // 検索ワードの引き継ぎ … … 136 135 137 136 $this->tpl_page_type = 'total/page_'. $page .'.tpl'; 137 // FIXME 可読性が低いので call_user_func_array を使わない (またはメソッド名を1つの定数値とする) 実装に。 138 138 list($this->arrResults, $this->tpl_image) = call_user_func_array(array($this, 'lfGetOrder'.$page), 139 139 array($type, $sdate, $edate)); … … 207 207 208 208 // 月度集計 209 $objFormParam->addParam('月度 ', 'search_startyear_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear_m']);210 $objFormParam->addParam('月度 ', 'search_startmonth_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth_m']);209 $objFormParam->addParam('月度(年)', 'search_startyear_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear_m']); 210 $objFormParam->addParam('月度(月)', 'search_startmonth_m', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth_m']); 211 211 // 期間集計 212 $objFormParam->addParam(' 開始日', 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear']);213 $objFormParam->addParam(' 開始日', 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth']);214 $objFormParam->addParam(' 開始日', 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startday']);215 $objFormParam->addParam(' 終了日', 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endyear']);216 $objFormParam->addParam(' 終了日', 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endmonth']);217 $objFormParam->addParam(' 終了日', 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endday']);212 $objFormParam->addParam('期間(開始日)', 'search_startyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startyear']); 213 $objFormParam->addParam('期間(開始日)', 'search_startmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startmonth']); 214 $objFormParam->addParam('期間(開始日)', 'search_startday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['startday']); 215 $objFormParam->addParam('期間(終了日)', 'search_endyear', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endyear']); 216 $objFormParam->addParam('期間(終了日)', 'search_endmonth', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endmonth']); 217 $objFormParam->addParam('期間(終了日)', 'search_endday', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $arrList['endday']); 218 218 219 219 // hiddenデータの取得用 … … 221 221 $objFormParam->addParam('', 'type'); 222 222 $objFormParam->addParam('', 'mode'); 223 $objFormParam->addParam('', ' form');223 $objFormParam->addParam('', 'search_form'); 224 224 } 225 225 … … 228 228 229 229 $objFormParam->convParam(); 230 $objErr = new SC_CheckError_Ex( );230 $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); 231 231 $objErr->arrErr = $objFormParam->checkError(); 232 232 233 233 // 特殊項目チェック 234 if ($objFormParam->getValue('form') == 1) { 235 $objErr->doFunc(array('月度', 'search_startyear_m'), array('ONE_EXIST_CHECK')); 236 } 237 238 if ($objFormParam->getValue('form') == 2) { 239 $objErr->doFunc(array('期間', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('FULL_EXIST_CHECK')); 240 } 241 $objErr->doFunc(array('月度', 'search_startyear_m', 'search_startmonth_m'), array('ALL_EXIST_CHECK')); 242 $objErr->doFunc(array('開始日', 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); 243 $objErr->doFunc(array('終了日', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); 244 $objErr->doFunc(array('開始日', '終了日', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); 234 235 // 月度集計 236 if ($objFormParam->getValue('search_form') == 1) { 237 $objErr->doFunc(array('月度', 'search_startyear_m', 'search_startmonth_m'), array('FULL_EXIST_CHECK')); 238 } 239 240 // 期間集計 241 if ($objFormParam->getValue('search_form') == 2) { 242 $objErr->doFunc(array('期間(開始日)', 'search_startyear', 'search_startmonth', 'search_startday'), array('FULL_EXIST_CHECK')); 243 $objErr->doFunc(array('期間(終了日)', 'search_endyear', 'search_endmonth', 'search_endday'), array('FULL_EXIST_CHECK')); 244 $objErr->doFunc(array('期間(開始日)', 'search_startyear', 'search_startmonth', 'search_startday'), array('CHECK_DATE')); 245 $objErr->doFunc(array('期間(終了日)', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_DATE')); 246 $objErr->doFunc(array('期間(開始日)', '期間(終了日)', 'search_startyear', 'search_startmonth', 'search_startday', 'search_endyear', 'search_endmonth', 'search_endday'), array('CHECK_SET_TERM')); 247 } 248 245 249 return $objErr->arrErr; 246 250 } … … 272 276 /* フォームで入力された日付を適切な形にする */ 273 277 function lfSetStartEndDate(&$objFormParam) { 274 275 278 $arrRet = $objFormParam->getHashArray(); 276 $out_flg = 0; 277 278 foreach ($arrRet as $key => $val) { 279 if ($val == '') { 280 continue; 281 } 282 switch ($key) { 283 case 'search_startyear': 284 $sdate = $objFormParam->getValue('search_startyear') . '/' . $objFormParam->getValue('search_startmonth') . '/' . $objFormParam->getValue('search_startday'); 285 break; 286 case 'search_endyear': 287 $edate = $objFormParam->getValue('search_endyear') . '/' . $objFormParam->getValue('search_endmonth') . '/' . $objFormParam->getValue('search_endday'); 288 break; 289 case 'search_startyear_m': 290 list($sdate, $edate) = SC_Utils_Ex::sfTermMonth($objFormParam->getValue('search_startyear_m'), 291 $objFormParam->getValue('search_startmonth_m'), 292 CLOSE_DAY); 293 $out_flg = 1; 294 break; 295 default: 296 break; 297 } 298 // 月度集計の場合に、集計期間が本日日付で上書きされてしまうのを回避するため 299 if (($objFormParam->getValue('form') == 1) && ($out_flg == 1)) { 300 break; 301 } 279 280 // 月度集計 281 if ($arrRet['search_form'] == 1) { 282 list($sdate, $edate) = SC_Utils_Ex::sfTermMonth($arrRet['search_startyear_m'], 283 $arrRet['search_startmonth_m'], 284 CLOSE_DAY); 285 } 286 // 期間集計 287 elseif ($arrRet['search_form'] == 2) { 288 $sdate = $arrRet['search_startyear'] . '/' . $arrRet['search_startmonth'] . '/' . $arrRet['search_startday']; 289 $edate = $arrRet['search_endyear'] . '/' . $arrRet['search_endmonth'] . '/' . $arrRet['search_endday']; 302 290 } 303 291
Note: See TracChangeset
for help on using the changeset viewer.