Changeset 15636 for branches/feature-module-update/data
- Timestamp:
- 2007/09/06 20:18:34 (17 years ago)
- Location:
- branches/feature-module-update/data/class
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/feature-module-update/data/class/graph/SC_GraphBase.php
r15598 r15636 261 261 imagefilledrectangle($this->image, $left - 2, $top - 2, $left + $text_width + 2, $top + $font_size + 2, $this->labelbg_color); 262 262 } 263 //$text = mb_convert_encoding($text, "UTF-8", CHAR_CODE); 264 $text = mb_convert_encoding($text, CHAR_CODE); 263 /* 264 * XXX EUC-JP にしないと Warning がでる. 265 * --enable-gd-jis-conv も関係していそうだが, このオプションを 266 * つけなくても出る. 267 * 268 * Warning: imagettftext() [function.imagettftext]: 269 * any2eucjp(): something happen in 270 * 271 * http://www.php.net/imagettftext を見ると, UTF-8 にしろと 272 * 書いてあるのに何故? 273 */ 274 $text = mb_convert_encoding($text, "EUC-JP", CHAR_CODE); 275 //$text = mb_convert_encoding($text, CHAR_CODE); 265 276 if($color != NULL) { 266 277 ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $color, FONT_PATH, $text); -
branches/feature-module-update/data/class/pages/admin/total/LC_Page_Admin_Total.php
r15626 r15636 55 55 $this->cashtime = time(); 56 56 $this->objBatch = new SC_Batch_Daily_Ex(); 57 58 // TODO エレガントじゃない... 59 if (!isset($_POST['search_startyear'])) $_POST['search_startyear'] = ""; 60 if (!isset($_POST['search_startmonth'])) $_POST['search_startmonth'] = ""; 61 if (!isset($_POST['search_startday'])) $_POST['search_startday'] = ""; 62 if (!isset($_POST['search_endyear'])) $_POST['search_endyear'] = ""; 63 if (!isset($_POST['search_endmonth'])) $_POST['search_endmonth'] = ""; 64 if (!isset($_POST['search_endday'])) $_POST['search_endday'] = ""; 65 66 if (!isset($_POST['search_startyear_m'])) $_POST['search_startyear_m'] = ""; 57 67 } 58 68 … … 101 111 $this->arrErr = $this->lfCheckError(); 102 112 $arrRet = $this->objFormParam->getHashArray(); 103 104 113 // 入力エラーなし 105 if ( count($this->arrErr) == 0) {114 if (empty($this->arrErr)) { 106 115 foreach ($arrRet as $key => $val) { 107 116 if($val == "") { … … 122 131 } 123 132 } 124 125 133 if($this->objFormParam->getValue('type') != "") { 126 134 $type = $this->objFormParam->getValue('type'); 135 } else { 136 $type = ""; 127 137 } 128 138 … … 233 243 } 234 244 235 236 237 245 // 登録・更新日検索用 238 246 $objDate = new SC_Date(); … … 246 254 247 255 $this->tpl_subtitle = $this->arrTitle[$this->objFormParam->getValue('page')]; 248 249 256 $objView->assignobj($this); 250 257 $objView->display(MAIN_FRAME); … … 464 471 465 472 $ret_path = ""; 466 467 473 // 結果が0行以上ある場合のみグラフを生成する。 468 474 if(count($arrResults) > 0) { 469 475 // グラフの生成 470 $arrList = sfArrKeyValue($arrResults, $keyname, "total", GRAPH_PIE_MAX, GRAPH_LABEL_MAX); 476 $arrList = SC_Utils_Ex::sfArrKeyValue($arrResults, $keyname, 477 "total", GRAPH_PIE_MAX, 478 GRAPH_LABEL_MAX); 471 479 472 480 // 一時ファイル名の取得 … … 516 524 if(count($arrResults) > 0) { 517 525 // グラフの生成 518 $arrList = sfArrKeyValue($arrResults, $keyname, "total", GRAPH_PIE_MAX, GRAPH_LABEL_MAX);526 $arrList = SC_Utils_Ex::sfArrKeyValue($arrResults, $keyname, "total", GRAPH_PIE_MAX, GRAPH_LABEL_MAX); 519 527 520 528 // 一時ファイル名の取得 … … 557 565 // グラフ用のPNGファイル名 558 566 function lfGetGraphPng($keyname) { 559 if (!isset($_POST['search_startyear_m'])) $_POST['search_startyear_m'] = ""; 567 560 568 if($_POST['search_startyear_m'] != "") { 561 569 $pngname = sprintf("%s_%02d%02d.png", $keyname, substr($_POST['search_startyear_m'],2), $_POST['search_startmonth_m']); … … 568 576 // 会員、非会員集計のWHERE分の作成 569 577 function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = "customer_id") { 578 $where = ""; 570 579 // 取得日付の指定 571 580 if($sdate != "") { … … 605 614 } 606 615 607 return array($where, $arrval);616 return array($where, array()); 608 617 } 609 618 … … 703 712 if($graph) { 704 713 $image_key = "job_" . $type; 705 $objPage->tpl_image = lfGetGraphPie($objPage->arrResults, "job_name", $image_key, "(売上比率)", $sdate, $edate);714 $objPage->tpl_image = $this->lfGetGraphPie($objPage->arrResults, "job_name", $image_key, "(売上比率)", $sdate, $edate); 706 715 } 707 716 }
Note: See TracChangeset
for help on using the changeset viewer.