git-svn-id: http://xe-core.googlecode.com/svn/trunk@1025 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/editor/components/poll_maker/tpl/popup.html

@@ -7,6 +7,7 @@
     <input type="hidden" name="component" value="{$component_info->component_name}" />
     <input type="hidden" name="method" value="insertPoll" />
     <input type="hidden" name="poll_srl" value="" />
+    <input type="hidden" name="upload_target_srl" value="{$upload_target_srl}" />
 
     <div class="editor_window">
         <div class="editor_title">{$component_info->title} ver. {$component_info->version} <a href="#" onclick="popopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo');return false;"><img src="../../../tpl/images/about_component.gif" title="{$lang->about_component}" alt="{$lang->about_component}" class="about_component_icon" border="0" /></a></div>

modules/poll/lang/ko.lang.php

@@ -6,8 +6,8 @@
      **/
 
     $lang->poll_stop_date = "설문조사 종료일";
-    $lang->poll_total_count = "참가자";
+    $lang->poll_join_count = "참가자";
-    $lang->poll_check_count = "필수 선택 항목수";
+    $lang->poll_checkcount = "필수 선택 항목수";
 
     $lang->cmd_delete_checked_poll = '선택항목 삭제';
     $lang->cmd_apply_poll = '설문 참여';

modules/poll/poll.controller.php

@@ -17,6 +17,8 @@
          * @brief 팝업창에서 설문 작성 완료후 저장을 누를때 설문 등록
          **/
         function procInsert() {
+            $upload_target_srl = Context::get('upload_target_srl');
+
             $stop_year = Context::get('stop_year');
             $stop_month = Context::get('stop_month');
             $stop_day = Context::get('stop_day');
@@ -64,6 +66,7 @@
             $poll_args->list_order = $poll_srl*-1;
             $poll_args->stop_date = $args->stop_date;
             $poll_args->poll_count = 0;
+            $poll_args->upload_target_srl = $upload_target_srl;
             $output = executeQuery('poll.insertPoll', $poll_args);
             if(!$output->toBool()) {
                 $oDB->rollback();
@@ -80,6 +83,7 @@
                 $title_args->poll_count = 0;
                 $title_args->list_order = $title_args->poll_index_srl * -1;
                 $title_args->member_srl = $member_srl;
+                $title_args->upload_target_srl = $upload_target_srl;
                 $output = executeQuery('poll.insertPollTitle', $title_args);
                 if(!$output->toBool()) {
                     $oDB->rollback();
@@ -93,6 +97,7 @@
                     $item_args->poll_index_srl = $title_args->poll_index_srl;
                     $item_args->title = $v;
                     $item_args->poll_count = 0;
+                    $item_args->upload_target_srl = $upload_target_srl;
                     $output = executeQuery('poll.insertPollItem', $item_args);
                     if(!$output->toBool()) {
                         $oDB->rollback();

modules/poll/queries/insertPoll.xml

@@ -8,6 +8,7 @@
         <column name="member_srl" var="member_srl" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="poll_count" var="poll_count" default="0" />
+        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="list_order" var="list_order" default="0" />
     </columns>

modules/poll/queries/insertPollItem.xml

@@ -7,6 +7,7 @@
         <column name="poll_srl" var="poll_srl" filter="number" notnull="notnull" />
         <column name="poll_index_srl" var="poll_index_srl" filter="number" notnull="notnull" />
         <column name="poll_count" var="poll_count" default="0" />
+        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" />
     </columns>
 </query>

modules/poll/queries/insertPollTitle.xml

@@ -9,6 +9,7 @@
         <column name="poll_count" var="poll_count" default="0" />
         <column name="checkcount" var="checkcount" notnull="notnull" default="1" />
         <column name="member_srl" var="member_srl" />
+        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="list_order" var="list_order" default="0" />

modules/poll/schemas/poll.xml

@@ -1,6 +1,7 @@
 <table name="poll">
     <column name="poll_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="stop_date" type="date" />
+    <column name="upload_target_srl" type="number" size="11" notnull="notnull" index="idx_upload_target_srl" />
     <column name="poll_count" type="number" size="11" notnull="notnull" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
     <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />

modules/poll/schemas/poll_item.xml

@@ -2,6 +2,7 @@
     <column name="poll_item_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="poll_srl" type="number" size="11" notnull="notnull" index="index_poll_srl" />
     <column name="poll_index_srl" type="number" size="11" notnull="notnull" index="idx_poll_index_srl" />
+    <column name="upload_target_srl" type="number" size="11" notnull="notnull" index="idx_upload_target_srl" />
     <column name="title" type="varchar" size="250" notnull="notnull" />
     <column name="poll_count" type="number" size="11" notnull="notnull" />
 </table>

modules/poll/schemas/poll_title.xml

@@ -4,6 +4,7 @@
     <column name="title" type="varchar" size="250" notnull="notnull" />
     <column name="checkcount" type="number" size="11" notnull="notnull" default="1" />
     <column name="poll_count" type="number" size="11" notnull="notnull" />
+    <column name="upload_target_srl" type="number" size="11" notnull="notnull" index="idx_upload_target_srl" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
     <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="regdate" type="date" index="idx_regdate" />

modules/poll/tpl/css/poll.css

@@ -20,7 +20,7 @@
     float:left;
 }
 
-.poll_total_count {
+.poll_join_count {
     float:right;
 }
 

modules/poll/tpl/filter/delete_checked.xml

@@ -0,0 +1,12 @@
+<filter name="delete_checked" module="poll" act="procPollAdminDeleteChecked" confirm_msg_code="confirm_delete">
+    <form>
+        <node target="cart" required="true" />
+    </form>
+    <parameter>
+        <param name="cart" target="cart" />
+    </parameter>
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>

modules/poll/tpl/form.html

@@ -41,7 +41,7 @@
 
                 <!--@if($val->checkcount>1)-->
                 <div class="checkcount">
-                    {$lang->poll_check_count} : {$val->checkcount}
+                    {$lang->poll_checkcount} : {$val->checkcount}
                 </div>
                 <!--@end-->
             </div>

modules/poll/tpl/js/poll.js

@@ -1,7 +1,7 @@
 /* 설문 참여 함수 */
 function doPoll(fo_obj) {
 
-    var check_count = new Array();
+    var checkcount = new Array();
     var item = new Array();
 
     for(var i=0;i<fo_obj.length;i++) {
@@ -12,7 +12,7 @@ function doPoll(fo_obj) {
         if(name.indexOf('checkcount')>-1) {
             var t = name.split('_');
             var poll_srl_index = parseInt(t[1],10);
-            check_count[poll_srl_index] = obj.value;
+            checkcount[poll_srl_index] = obj.value;
             item[poll_srl_index] = new Array();
 
         } else if(name.indexOf('item_')>-1) {
@@ -24,8 +24,8 @@ function doPoll(fo_obj) {
     }
 
     var poll_srl_indexes = "";
-    for(var poll_srl_index in check_count) {
+    for(var poll_srl_index in checkcount) {
-        var count = check_count[poll_srl_index];
+        var count = checkcount[poll_srl_index];
         var items = item[poll_srl_index];
         if(count > items.length) {
             alert(poll_alert_lang);

modules/poll/tpl/poll_list.html

@@ -15,15 +15,15 @@
     <tr>
         <th colspan="2">{$lang->no}</th>
         <th>{$lang->title}</th>
-        <th>{$lang->poll_check_count}</th>
+        <th>{$lang->poll_checkcount}</th>
-        <th>{$lang->poll_total_count}</th>
+        <th>{$lang->poll_join_count}</th>
         <th>{$lang->regdate}</th>
     </tr>
     <!--@foreach($poll_list as $no => $val)-->
     <tr>
         <td>{$no}</td>
         <td><input type="checkbox" name="cart" value="{$val->poll_index_srl}" /></td>
-        <td>{$val->title}</td>
+        <td><a href="#" onclick="winopen('./?document_srl={$val->upload_target_srl}'); return false;"/>{$val->title}</a></td>
         <td>{$val->checkcount}</td>
         <td>{$val->poll_count}</td>
         <td>{zdate($val->regdate,"Y-m-d H:i")}</td>

modules/poll/tpl/result.html

@@ -3,8 +3,8 @@
 <div class="poll_box" style="{$poll->style}">
 
     <div class="poll_title_box">
-        <div class="poll_total_count">
+        <div class="poll_join_count">
-            {$lang->poll_total_count} : {number_format($poll->poll_count)}
+            {$lang->poll_join_count} : {number_format($poll->poll_count)}
         </div>
         <div class="poll_stop_date">
             {$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")}