From bf65634dc4dbc2a9b9c78efe662d957d8bcee9b5 Mon Sep 17 00:00:00 2001 From: qdayy Date: Mon, 23 Sep 2013 10:09:07 +0800 Subject: [PATCH 1/7] readout the table of adinfo --- src/Controller/Admin/AdinfoController.php | 21 ++-- src/Controller/Admin/ChannelController.php | 10 +- src/Model/Adinfo.php | 136 +++++++++++++++++++++ template/admin/Adinfo-list.phtml | 86 +++++++++++++ 4 files changed, 239 insertions(+), 14 deletions(-) create mode 100644 src/Model/Adinfo.php create mode 100644 template/admin/Adinfo-list.phtml diff --git a/src/Controller/Admin/AdinfoController.php b/src/Controller/Admin/AdinfoController.php index d6cce26..b05d4b8 100755 --- a/src/Controller/Admin/AdinfoController.php +++ b/src/Controller/Admin/AdinfoController.php @@ -37,7 +37,10 @@ class AdinfoController extends ActionController { protected $channelColumns = array( - 'id', 'name', 'protal_id', 'time_create', 'time_update', 'user_update', + 'id', 'protal_id', 'channel_id', + 'adformat','url','supplier_id','content', + 'ad_date','time_create','time_update', + 'user_update', ); protected $displayColumns = array( @@ -66,16 +69,16 @@ public function indexAction() if (!empty($schName)) { $where['name like ?'] = sprintf('%%%s%%',$schName); } - $modelAdinfo = $this->getModel('channel'); + $modelAdinfo = $this->getModel('Adinfo'); $channels = $modelAdinfo->getSearchRows($where, $limit, $offset, $this->channelColumns, sprintf('%s %s', $orderby, $order)); /* get protals info */ - $protal_ids = array(); - foreach($channels as $channel) { - if (!in_array($channel['protal_id'], $protal_ids)) { - array_push(&$protal_ids, $channel['protal_id']); - } - } + // $protal_ids = array(); + // foreach($channels as $channel) { + // if (!in_array($channel['protal_id'], $protal_ids)) { + // array_push(&$protal_ids, $channel['protal_id']); + // } + // } $modelProtal = $this->getModel('protal'); $protals = $modelProtal->getRows($protal_ids, array('id','name')); @@ -138,7 +141,7 @@ public function indexAction() 'schUrl' => $schUrl, ); $this->view()->assign($assign); - $this->view()->setTemplate('channel-list'); + $this->view()->setTemplate('Adinfo-list'); } /** diff --git a/src/Controller/Admin/ChannelController.php b/src/Controller/Admin/ChannelController.php index 0db19c4..bfa3448 100755 --- a/src/Controller/Admin/ChannelController.php +++ b/src/Controller/Admin/ChannelController.php @@ -71,11 +71,11 @@ public function indexAction() /* get protals info */ $protal_ids = array(); - foreach($channels as $channel) { - if (!in_array($channel['protal_id'], $protal_ids)) { - array_push(&$protal_ids, $channel['protal_id']); - } - } + // foreach($channels as $channel) { + // if (!in_array($channel['protal_id'], $protal_ids)) { + // array_push(&$protal_ids, $channel['protal_id']); + // } + // } $modelProtal = $this->getModel('protal'); $protals = $modelProtal->getRows($protal_ids, array('id','name')); diff --git a/src/Model/Adinfo.php b/src/Model/Adinfo.php new file mode 100644 index 0000000..0c1ae72 --- /dev/null +++ b/src/Model/Adinfo.php @@ -0,0 +1,136 @@ + + * @since 1.0 + * @package Module\Admanager + */ + +namespace Module\Admanager\Model; + +use Pi; +use Pi\Application\Model\Model; +use Zend\Db\Sql\Expression; + +class Adinfo extends Model +{ + + public static function getDefaultColumns() + { + return array( + 'id', 'protal_id', 'channel_id', + 'adformat','url','supplier_id','content', + 'ad_date','time_create','time_update', + 'user_update', + ); + } + + /** + * Get channels by ids + * + * @param $ids Channel ids + * @param null $columns Columns, null for default + * @return array + */ + public function getRows($ids, $columns = null) + { + $result = $rows = array(); + + if (null === $columns) { + $columns = self::getDefaultColumns(); + } + + if ($ids) { + $result = array_flip($ids); + + $rows = $this->select(array('id' => $ids)); + + foreach ($rows as $row) { + $result[$row['id']] = $row; + } + + $result = array_filter($result, function($var) { + return is_array($var); + }); + } + + return $result; + } + + public function getSearchRows($where = array(), $limit = null, $offset = null, $columns = null, $order = null) + { + $result = $rows = array(); + + if (null === $columns) { + $columns = self::getDefaultColumns(); + } + + if (!in_array('id', $columns)) { + $columns[] = 'id'; + } + + $order = (null === $order) ? 'time_update DESC' : $order; + + $select = $this->select() + ->columns($columns); + + if ($where) { + $select->where($where); + } + + if ($limit) { + $select->limit(intval($limit)); + } + + if ($offset) { + $select->offset(intval($offset)); + } + + if ($order) { + $select->order($order); + } + + $rows = $this->selectWith($select)->toArray(); + + $dateFormat = Pi::config('date_format', 'intl'); + foreach ($rows as $row) { + if (!empty($row['time_create'])) { + $row['time_create'] = date($dateFormat, $row['time_create']); + } + if (!empty($row['time_update'])) { + $row['time_update'] = date($dateFormat, $row['time_update']); + } + $result[$row['id']] = $row; + } + + return $result; + } + + public function getSearchRowsCount($where = array()) + { + $result = 0; + + $select = $this->select() + ->columns(array('total' => new Expression('count(id)'))); + + if ($where) { + $select->where($where); + } + + $resultset = $this->selectWith($select); + $result = intval($resultset->current()->total); + + return $result; + } + +} diff --git a/template/admin/Adinfo-list.phtml b/template/admin/Adinfo-list.phtml new file mode 100644 index 0000000..f717769 --- /dev/null +++ b/template/admin/Adinfo-list.phtml @@ -0,0 +1,86 @@ + + +
+ + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +
+
+paginationControl($paginator, 'Sliding', 'paginator.phtml',array('class' => 'pagination-right')); ?> + \ No newline at end of file From 71e82603e5376fbea3a6f38a74a4cbd1029bebf7 Mon Sep 17 00:00:00 2001 From: qdayy Date: Mon, 23 Sep 2013 11:19:39 +0800 Subject: [PATCH 2/7] show things in the table of adinfo --- src/Controller/Admin/AdinfoController.php | 23 ++- template/admin/Adinfo-list.phtml | 178 +++++++++++----------- 2 files changed, 108 insertions(+), 93 deletions(-) diff --git a/src/Controller/Admin/AdinfoController.php b/src/Controller/Admin/AdinfoController.php index b05d4b8..553f7b2 100755 --- a/src/Controller/Admin/AdinfoController.php +++ b/src/Controller/Admin/AdinfoController.php @@ -44,10 +44,17 @@ class AdinfoController extends ActionController ); protected $displayColumns = array( - array('column'=>'protal_id', 'name'=> 'Protal', 'width'=>'15'), - array('column'=>'name', 'name'=> 'Adinfo name', 'width'=>'45'), - array('column'=>'time_create', 'name'=> 'Added Date', 'width'=>'15'), - array('column'=>'time_update', 'name'=> 'Last Modified','width'=>'15'), + array('column'=>'id', 'name'=> 'id', 'width'=>'15'), + array('column'=>'protal_id', 'name'=> 'protal_id', 'width'=>'45'), + array('column'=>'channel_id', 'name'=> 'channel_id', 'width'=>'15'), + array('column'=>'adformat', 'name'=> 'adformat', 'width'=>'15'), + array('column'=>'url', 'name'=>'url', 'width'=>'15'), + array('column'=>'supplier_id','name'=>'supplier_id', 'width'=>'15'), + array('column'=>'content', 'name'=>'content', 'width'=>'15'), + array('column'=>'ad_date', 'name'=>'ad_date', 'width'=>'15'), + array('column'=>'time_create','name'=>'time_create', 'width'=>'15'), + array('column'=>'time_update','name'=>'time_update', 'width'=>'15'), + array('column'=>'user_update','name'=>'user_update', 'width'=>'15'), ); /** @@ -70,7 +77,7 @@ public function indexAction() $where['name like ?'] = sprintf('%%%s%%',$schName); } $modelAdinfo = $this->getModel('Adinfo'); - $channels = $modelAdinfo->getSearchRows($where, $limit, $offset, $this->channelColumns, sprintf('%s %s', $orderby, $order)); + $Adinfos = $modelAdinfo->getSearchRows($where, $limit, $offset, $this->channelColumns, sprintf('%s %s', $orderby, $order)); /* get protals info */ // $protal_ids = array(); @@ -131,10 +138,10 @@ public function indexAction() } /* end table header */ $assign = array( - 'channels' => $channels, + 'Adinfos' => $Adinfos, 'protals' => $protals, - 'paginator' => $paginator, - 'tableHeader' => $tableHeader, + 'paginator' => $paginator, + 'tableHeader' => $tableHeader, 'orderby' => $orderby, 'order' => $order, 'schName' => $schName, diff --git a/template/admin/Adinfo-list.phtml b/template/admin/Adinfo-list.phtml index f717769..f572b5f 100644 --- a/template/admin/Adinfo-list.phtml +++ b/template/admin/Adinfo-list.phtml @@ -1,86 +1,94 @@ - - -
- - -
- - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - -
-
-paginationControl($paginator, 'Sliding', 'paginator.phtml',array('class' => 'pagination-right')); ?> - \ No newline at end of file From ef462e0d099633a844518794b25dfa1c56344693 Mon Sep 17 00:00:00 2001 From: qdayy Date: Tue, 24 Sep 2013 13:34:24 +0800 Subject: [PATCH 3/7] make the page of adinfo-list looks better --- src/Controller/Admin/AdinfoController.php | 11 ++++------- template/admin/Adinfo-list.phtml | 5 +---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Controller/Admin/AdinfoController.php b/src/Controller/Admin/AdinfoController.php index 553f7b2..0c5b5c3 100755 --- a/src/Controller/Admin/AdinfoController.php +++ b/src/Controller/Admin/AdinfoController.php @@ -44,17 +44,14 @@ class AdinfoController extends ActionController ); protected $displayColumns = array( - array('column'=>'id', 'name'=> 'id', 'width'=>'15'), - array('column'=>'protal_id', 'name'=> 'protal_id', 'width'=>'45'), - array('column'=>'channel_id', 'name'=> 'channel_id', 'width'=>'15'), + array('column'=>'supplier_id','name'=>'supplier_id', 'width'=>'5'), + array('column'=>'protal_id', 'name'=> 'protal_id', 'width'=>'5'), + array('column'=>'channel_id', 'name'=> 'channel_id', 'width'=>'5'), array('column'=>'adformat', 'name'=> 'adformat', 'width'=>'15'), - array('column'=>'url', 'name'=>'url', 'width'=>'15'), - array('column'=>'supplier_id','name'=>'supplier_id', 'width'=>'15'), + array('column'=>'url', 'name'=>'url', 'width'=>'15'), array('column'=>'content', 'name'=>'content', 'width'=>'15'), - array('column'=>'ad_date', 'name'=>'ad_date', 'width'=>'15'), array('column'=>'time_create','name'=>'time_create', 'width'=>'15'), array('column'=>'time_update','name'=>'time_update', 'width'=>'15'), - array('column'=>'user_update','name'=>'user_update', 'width'=>'15'), ); /** diff --git a/template/admin/Adinfo-list.phtml b/template/admin/Adinfo-list.phtml index f572b5f..5e2432f 100644 --- a/template/admin/Adinfo-list.phtml +++ b/template/admin/Adinfo-list.phtml @@ -35,17 +35,14 @@ - + - - - From bc3bcebe0f7596490d0e073ae0fd7c3ba76d3e82 Mon Sep 17 00:00:00 2001 From: qdayy Date: Tue, 24 Sep 2013 14:10:49 +0800 Subject: [PATCH 4/7] send data to the table of adinfo --- README.md | 3 + src/Controller/Admin/AdinfoController.php | 79 +++++++++++++---------- src/Form/AdinfoFilter.php | 32 ++++++++- src/Form/AdinfoForm.php | 33 +++++----- template/admin/Adinfo-edit.phtml | 27 ++++++++ 5 files changed, 122 insertions(+), 52 deletions(-) create mode 100644 template/admin/Adinfo-edit.phtml diff --git a/README.md b/README.md index e69de29..6a24d1c 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,3 @@ +能够读出adinfo数据库中的内容并显示出来 +优化显示的页面 +实现adinfo数据的增加 \ No newline at end of file diff --git a/src/Controller/Admin/AdinfoController.php b/src/Controller/Admin/AdinfoController.php index 0c5b5c3..cab372e 100755 --- a/src/Controller/Admin/AdinfoController.php +++ b/src/Controller/Admin/AdinfoController.php @@ -43,15 +43,21 @@ class AdinfoController extends ActionController 'user_update', ); + protected $AdinfoColumns = array( + 'id', 'protal_id', 'channel_id','adformat', + 'url','supplier_id','content','ad_date', + 'time_create', 'time_update', 'user_update', + ); + protected $displayColumns = array( - array('column'=>'supplier_id','name'=>'supplier_id', 'width'=>'5'), - array('column'=>'protal_id', 'name'=> 'protal_id', 'width'=>'5'), - array('column'=>'channel_id', 'name'=> 'channel_id', 'width'=>'5'), - array('column'=>'adformat', 'name'=> 'adformat', 'width'=>'15'), - array('column'=>'url', 'name'=>'url', 'width'=>'15'), - array('column'=>'content', 'name'=>'content', 'width'=>'15'), - array('column'=>'time_create','name'=>'time_create', 'width'=>'15'), - array('column'=>'time_update','name'=>'time_update', 'width'=>'15'), + array('column'=>'supplier_id', 'name'=>'supplier_id', 'width'=>'8' ), + array('column'=>'protal_id', 'name'=> 'protal_id', 'width'=>'8' ), + array('column'=>'channel_id', 'name'=> 'channel_id', 'width'=>'8' ), + array('column'=>'adformat', 'name'=> 'adformat', 'width'=>'8' ), + array('column'=>'url', 'name'=> 'url', 'width'=>'15'), + array('column'=>'content', 'name'=>'content', 'width'=>'8' ), + array('column'=>'time_create', 'name'=>'Added Date', 'width'=>'20'), + array('column'=>'time_update', 'name'=>'Last Modified', 'width'=>'50'), ); /** @@ -149,7 +155,7 @@ public function indexAction() } /** - * Add a channel + * Add an ad */ public function addAction() { @@ -160,28 +166,28 @@ public function addAction() $form->setInputFilter(new AdinfoFilter); $form->setData($data); if ($form->isValid()) { - $values = $form->getData(); - foreach (array_keys($values) as $key) { - if (!in_array($key, $this->channelColumns)) { - unset($values[$key]); - } - } - $values['time_create'] = $values['time_update'] = time(); - unset($values['id']); - $row = $this->getModel('channel')->createRow($values); - $row->save(); - if ($row->id) { - $message = __('Adinfo data saved successfully.'); - //$this->view()->setTemplate(false); - $this->redirect()->toRoute('', array('action' => 'index')); - return; - } else { - $message = __('Adinfo data not saved.'); - } + $values = $form->getData(); + foreach (array_keys($values) as $key) { + if (!in_array($key, $this->AdinfoColumns)) { + unset($values[$key]); + } + } + $values['time_create'] = $values['time_update'] = time(); + unset($values['id']); + $row = $this->getModel('Adinfo')->createRow($values); + $row->save(); + if ($row->id) { + $message = __('Adinfo data saved successfully.'); + //$this->view()->setTemplate(false); + $this->redirect()->toRoute('', array('action' => 'index')); + return; + } else { + $message = __('Adinfo data not saved.'); + } } else { - $message = __('Invalid data, please check and re-submit.'); + $message = __('Invalid data, please check and re-submit.'); } - } else { + } else { $form = new AdinfoForm('channel'); $form->setAttribute('action', $this->url('', array('action' => 'add'))); $form->setData(array( @@ -189,13 +195,18 @@ public function addAction() 'section' => 'front', )); $message = ''; - } + } - - $this->view()->assign('form', $form); - $this->view()->assign('title', __('Add a channel')); + $assign=array('form' => $form, + 'data' => $data, + 'values' => $values, + 'row' => $row, + ); + $this->view()->assign($assign); + //$this->view()->assign('form', $form); + $this->view()->assign('title', __('Add a Adinfo')); $this->view()->assign('message', $message); - $this->view()->setTemplate('channel-edit'); + $this->view()->setTemplate('adinfo-edit'); } /** diff --git a/src/Form/AdinfoFilter.php b/src/Form/AdinfoFilter.php index 405205e..c57d14e 100755 --- a/src/Form/AdinfoFilter.php +++ b/src/Form/AdinfoFilter.php @@ -29,7 +29,7 @@ class AdinfoFilter extends InputFilter public function __construct() { $this->add(array( - 'name' => 'name', + 'name' => 'adformat', 'required' => true, 'filters' => array( array( @@ -45,12 +45,38 @@ public function __construct() )); $this->add(array( - 'name' => 'protal_id', + 'name' => 'url', 'filters' => array( array( - 'name' => 'Int', + 'name' => 'StringTrim', + ), + ), + 'validators' => array( + array( + 'name' => 'Regex', + 'options' => array( + 'pattern' => '/http:\/\/[\w.]+[\w\/]*[\w.]*\??[\w=&\+\%]*/is', + ), + ), + ), + )); + + $this->add(array( + 'name' => 'content', + 'required' => true, + 'filters' => array( + array( + 'name' => 'StringTrim', ), ), + 'validators' => array( + new StringLength(array( + 'min' => '3', + 'max' => '50', + )), + ), )); + } } + diff --git a/src/Form/AdinfoForm.php b/src/Form/AdinfoForm.php index 0b81083..fac54f5 100755 --- a/src/Form/AdinfoForm.php +++ b/src/Form/AdinfoForm.php @@ -18,18 +18,18 @@ * @version $Id$ */ + namespace Module\Admanager\Form; use Pi; use Pi\Form\Form as BaseForm; -use Module\Admanager\Model\Protal; class AdinfoForm extends BaseForm { public function getInputFilter() { if (!$this->filter) { - $this->filter = new AdinfoFilter; + $this->filter = new ProtalFilter; } return $this->filter; } @@ -37,32 +37,34 @@ public function getInputFilter() public function init() { $this->add(array( - 'name' => 'name', + 'name' => 'adformat', 'options' => array( - 'label' => __('Adinfo name'), + 'label' => __('adformat'), ), 'attributes' => array( 'type' => 'text', ) )); - $protalOptions = array(); - $model = Pi::model('protal', 'admanager'); - $protals = $model->getSearchRows(array(), null, null, array('name')); - foreach($protals as $protal_id=>$protal) { - $protalOptions[$protal_id] = $protal['name']; - } - $this->add(array( - 'name' => 'protal_id', + 'name' => 'url', 'options' => array( - 'label' => __('Protal'), + 'label' => __('Protal url'), ), 'attributes' => array( - 'type' => 'select', - 'options' => $protalOptions, + 'type' => 'text', + 'class' => 'input-xxlarge', ) + )); + $this->add(array( + 'name' => 'content', + 'options' => array( + 'label' => __('content'), + ), + 'attributes' => array( + 'type' => 'text', + ) )); $this->add(array( @@ -82,3 +84,4 @@ public function init() )); } } + diff --git a/template/admin/Adinfo-edit.phtml b/template/admin/Adinfo-edit.phtml new file mode 100644 index 0000000..a2e11a9 --- /dev/null +++ b/template/admin/Adinfo-edit.phtml @@ -0,0 +1,27 @@ + +

escape($title); ?>

+ +
+ +
+ + + templateComponent('form'); ?> +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+
\ No newline at end of file From 0aa69edf7c886b3ec60ac1c1bb9fb86c27dfc29f Mon Sep 17 00:00:00 2001 From: qdayy Date: Tue, 24 Sep 2013 14:22:37 +0800 Subject: [PATCH 5/7] delete atem by click 'delete' --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a24d1c..6a04ff2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ 能够读出adinfo数据库中的内容并显示出来 优化显示的页面 -实现adinfo数据的增加 \ No newline at end of file +实现adinfo数据的增加 +单击table中每行的右侧的delete按钮，可删除该条内容 \ No newline at end of file From 23092217a8f78903346b07f912d242abf4ce8e46 Mon Sep 17 00:00:00 2001 From: qdayy Date: Tue, 24 Sep 2013 14:36:14 +0800 Subject: [PATCH 6/7] delete atem by click 'delete' on the right side --- src/Controller/Admin/AdinfoController.php | 4 ++-- template/admin/Adinfo-list.phtml | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Controller/Admin/AdinfoController.php b/src/Controller/Admin/AdinfoController.php index cab372e..083da81 100755 --- a/src/Controller/Admin/AdinfoController.php +++ b/src/Controller/Admin/AdinfoController.php @@ -261,7 +261,7 @@ public function editAction() } /** - * deleting a channel + * deleting a ad * */ public function deleteAction() @@ -269,7 +269,7 @@ public function deleteAction() $id = Service::getParam($this, 'id', ''); $id = is_array($id)?$id:(array)$id; if (count($id)) { - $this->getModel('channel')->delete(array('id'=>$id)); + $this->getModel('Adinfo')->delete(array('id'=>$id)); } $this->redirect()->toRoute('', array('action' => 'index')); //return 1; diff --git a/template/admin/Adinfo-list.phtml b/template/admin/Adinfo-list.phtml index 5e2432f..c644ab6 100644 --- a/template/admin/Adinfo-list.phtml +++ b/template/admin/Adinfo-list.phtml @@ -7,7 +7,9 @@
- + + +
@@ -46,8 +48,8 @@ - - + + @@ -55,11 +57,12 @@
paginationControl($paginator, 'Sliding', 'paginator.phtml',array('class' => 'pagination-right')); ?> +