From 6ffba36c4d3357592c5e273b1091eb22724a756a Mon Sep 17 00:00:00 2001 From: BJRambo Date: Sun, 4 Jun 2017 19:54:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=88=EC=9D=BD=EC=9D=80=20=EC=AA=BD?= =?UTF-8?q?=EC=A7=80=ED=95=A8=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/communication/communication.model.php | 18 +++++++++++- modules/communication/communication.view.php | 28 ++++++++++++++++++- modules/communication/conf/module.xml | 1 + modules/communication/lang/ko.php | 1 + .../queries/getReadedMessages.xml | 25 +++++++++++++++++ .../skins/default/css/communication.css | 1 + .../communication/skins/default/messages.html | 6 ++-- 7 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 modules/communication/queries/getReadedMessages.xml diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index b8326bf97..78c6d2e41 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -267,10 +267,26 @@ class communicationModel extends communication $args->page = Context::get('page'); $args->list_count = 20; $args->page_count = 10; - + return executeQuery($query_id, $args, $columnList); } + function getReadedMessages($readed = 'N', $columnList = array()) + { + $logged_info = Context::get('logged_info'); + + $args = new stdClass(); + $args->member_srl = $logged_info->member_srl; + $args->readed = $readed; + $args->sort_index = 'message.list_order'; + $args->page = Context::get('page'); + $args->list_count = 20; + $args->page_count = 10; + $output = executeQueryArray('communication.getReadedMessages', $args, $columnList); + + return $output; + } + /** * Get a list of friends * @param int $friend_group_srl (default 0) diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index f56de4b2a..6f4eb55da 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -165,6 +165,33 @@ class communicationView extends communication $this->setTemplateFile('new_message'); } + function dispCommunicationUnreadList() + { + $oCommunicationModel = getModel('communication'); + + if($this->config->enable_message == 'N') + { + return $this->stop('msg_invalid_request'); + } + + if(!Context::get('is_logged')) + { + return $this->stop('msg_not_logged'); + } + + $columnList = array('message_srl', 'readed', 'title', 'member.member_srl', 'member.nick_name', 'message.regdate', 'readed_date'); + $output = $oCommunicationModel->getReadedMessages('N', $columnList); + + // set a template file + Context::set('total_count', $output->total_count); + Context::set('total_page', $output->total_page); + Context::set('page', $output->page); + Context::set('message_list', $output->data); + Context::set('page_navigation', $output->page_navigation); + + $this->setTemplateFile('messages'); + } + /** * Display message sending * @return void|Object (void : success, Object : fail) @@ -396,7 +423,6 @@ class communicationView extends communication $this->setTemplateFile('add_friend_group'); } - } /* End of file communication.view.php */ /* Location: ./modules/comment/communication.view.php */ diff --git a/modules/communication/conf/module.xml b/modules/communication/conf/module.xml index aa4d13f61..6b1553b9c 100644 --- a/modules/communication/conf/module.xml +++ b/modules/communication/conf/module.xml @@ -9,6 +9,7 @@ + diff --git a/modules/communication/lang/ko.php b/modules/communication/lang/ko.php index 81d5b03b0..b21a6ddab 100644 --- a/modules/communication/lang/ko.php +++ b/modules/communication/lang/ko.php @@ -19,6 +19,7 @@ $lang->cmd_view_friend = '친구 보기'; $lang->cmd_add_friend = '친구 등록'; $lang->cmd_message_box = '쪽지함'; $lang->cmd_view_message_box = '쪽지함 보기'; +$lang->cmd_view_unread_message_box = '읽지않은 쪽지함 보기'; $lang->cmd_store = '보관함 이동'; $lang->cmd_view_selected_frend_group = '선택된 그룹만 보기'; $lang->cmd_add_friend_group = '친구 그룹 생성'; diff --git a/modules/communication/queries/getReadedMessages.xml b/modules/communication/queries/getReadedMessages.xml new file mode 100644 index 000000000..9f5607dab --- /dev/null +++ b/modules/communication/queries/getReadedMessages.xml @@ -0,0 +1,25 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/modules/communication/skins/default/css/communication.css b/modules/communication/skins/default/css/communication.css index 0d1c81685..0f99fea0c 100644 --- a/modules/communication/skins/default/css/communication.css +++ b/modules/communication/skins/default/css/communication.css @@ -276,6 +276,7 @@ .xc .btn-group>.btn:focus, .xc .btn-group>.btn:active, .xc .btn-group>.btn.active{z-index:2} + /* Communication Module Customize */ .xc, .xc input, diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html index d9fbaf7c8..f0c1d9f33 100644 --- a/modules/communication/skins/default/messages.html +++ b/modules/communication/skins/default/messages.html @@ -1,9 +1,11 @@ +
- + +
@@ -67,7 +69,7 @@
-
{$val->nick_name} + {zdate($val->regdate,"Y-m-d")} {zdate($val->readed_date,"Y-m-d H:i")}