Changeset 20247

Timestamp:

2011/02/20 12:26:39 (13 years ago)

Author:

fukuda

Message:

#963 [管理画面]メルマガ管理 r20245 で混入したバグ修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/mail/history.tpl (modified) (3 diffs)
• class/pages/admin/mail/LC_Page_Admin_Mail_History.php (modified) (5 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl

@@ -25 +25 @@
 <input type="hidden" name="search_pageno" value="" />
 <input type="hidden" name="mode" value="" />
+  <!--{include file=$tpl_pager}-->
   <!--{if count($arrDataList) > 0}-->
   <div id="mail" class="contents-main">
@@ -46 +47 @@
             <td><!--{$arrDataList[cnt].end_date|sfDispDBDate|h}--></td>
             <td class="left"><!--{$arrDataList[cnt].subject|h}--></td>
-            <td><a href="javascript:;" onclick="win03('./preview.php?send_id=<!--{$arrDataList[cnt].send_id|h}-->', 'confirm', '720', '600'); return false;">確認</a></td>
+            <td><a href="javascript:;" onclick="win03('./preview.php?mode=history&amp;send_id=<!--{$arrDataList[cnt].send_id|h}-->', 'confirm', '720', '600'); return false;">確認</a></td>
             <td><a href="javascript:;" onclick="win03('./<!--{$smarty.const.DIR_INDEX_PATH}-->?mode=query&amp;send_id=<!--{$arrDataList[cnt].send_id|h}-->','query','615','800'); return false;">確認</a></td>
             <td><!--{$arrDataList[cnt].count_all|h}--></td>
@@ -67 +68 @@
     </div>
     <!--{else}-->
-      <div id="complete">
-          <div class="complete-top"></div>
-          <div class="contents">
-              <div class="message">
+      <div id="complete">
+          <div class="complete-top"></div>
+          <div class="contents">
+              <div class="message">
           配信履歴はありません
-              </div>
-          </div>
-          <div class="btn-area-top"></div>
-          <div class="btn-area">
-              <ul>
-                  <li><a class="btn-action" href="./<!--{$smarty.const.DIR_INDEX_PATH}-->"><span class="btn-prev">配信内容設定へ戻る</span></a></li>
-              </ul>
-          </div>
-          <div class="btn-area-bottom"></div>
-      </div>
+              </div>
+          </div>
+          <div class="btn-area-top"></div>
+          <div class="btn-area">
+              <ul>
+                  <li><a class="btn-action" href="./<!--{$smarty.const.DIR_INDEX_PATH}-->"><span class="btn-prev">配信内容設定へ戻る</span></a></li>
+              </ul>
+          </div>
+          <div class="btn-area-bottom"></div>
+      </div>
     <!--{/if}-->
 </form>

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php

@@ -49 +49 @@
         $this->tpl_subno = "history";
         $this->tpl_subtitle = '配信履歴';
-
+        $this->tpl_pager = 'pager.tpl';
     }
 
@@ -69 +69 @@
     function action() {
         // ページ初期設定
-        $objQuery = new SC_Query();
         $objSess = new SC_Session();
-        $objDate = new SC_Date();
-
         // 認証可否の判定
         SC_Utils_Ex::sfIsSuccess($objSess);
-
-        if (!isset($_GET['send_id'])) $_GET['send_id'] = "";
-        if (!isset($_POST['search_pageno'])) $_POST['search_pageno'] = "";
 
         switch ($this->getMode()) {
@@ -92 +86 @@
             break;
         }
-        $from = "dtb_send_history";
-
-        $where = " del_flg = ?";
-        $arrval[] = "0";
 
         // 行数の取得
         $linemax = $objQuery->count($from, $where, $arrval);
-        $this->tpl_linemax = $linemax;              // 何件が該当しました。表示用
 
         // ページ送りの取得
@@ -109 +98 @@
         $objQuery->setLimitOffset(SEARCH_PMAX, $startno);
 
-        // 表示順序
-        $order = "start_date DESC, send_id DESC";
-        $objQuery->setOrder($order);
-
-        $col = "*";
-        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id) AS count_all";
-        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 1) AS count_sent";
-        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 2) AS count_error";
-        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag IS NULL) AS count_unsent";
-
         // 検索結果の取得
-        $this->arrDataList = $objQuery->select($col, $from, $where, $arrval);
+        $this->arrDataList = $this->lfGetMailHistory();
     }
 
@@ -131 +110 @@
         parent::destroy();
     }
+    
+    /**
+     * 実行履歴の取得
+     *
+     * @return array( integer 全体件数, mixed メール配信データ一覧配列, mixed SC_PageNaviオブジェクト)
+     */
+    function lfGetMailHistory() {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $objQuery->setOrder("start_date DESC, send_id DESC");
+        
+        $col = "*";
+        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id) AS count_all";
+        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 1) AS count_sent";
+        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag = 2) AS count_error";
+        $col .= ",(SELECT COUNT(*) FROM dtb_send_customer WHERE dtb_send_customer.send_id = dtb_send_history.send_id AND send_flag IS NULL) AS count_unsent";
+        
+        $arrResult = $objQuery->select($col, "dtb_send_history", " del_flg = 0");
+        return $arrResult;
+        
+        /*
+        $page_rows = $arrParam['page_rows'];
+        if(SC_Utils_Ex::sfIsInt($page_rows)) {
+            $page_max = $page_rows;
+        }else{
+            $page_max = SEARCH_PMAX;
+        }
+        $disp_pageno = $arrParam['search_pageno'];
+        if($disp_pageno == 0) {
+            $disp_pageno = 1;
+        }
+        $offset = $page_max * ($disp_pageno - 1);
+        $objSelect->setLimitOffset($page_max, $offset);
+        $arrData = $objQuery->getAll($objSelect->getList(), $objSelect->arrVal);
+        
+        // 該当全体件数の取得
+        $linemax = $objQuery->getOne($objSelect->getListCount(), $objSelect->arrVal);
+        // ページ送りの取得
+        $objNavi = new SC_PageNavi($arrParam['search_pageno'],
+                                    $linemax,
+                                    $page_max,
+                                    "fnCustomerPage",
+                                    NAVI_PMAX);
+        return array($linemax, $arrData, $objNavi);
+    }   */
+    
 }
 ?>