+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+ <{/if}>
+
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+
+ <{assign var=start_pos value=0}>
+ <{foreach from=$action.timeframe_list item=timeframe}>
+ <{assign var=spacer_width value=`$timeframe.left-$start_pos`}>
+
+
transparent<{else}><{$timeframe.timeframe_color}><{/if}>" title="<{$timeframe.start_time|timezone_date:false:$lang._short_time_format}><{$lang.reservation_time_pause}><{$timeframe.end_time|timezone_date:false:$lang._short_time_format}>">
+ <{$timeframe.timeframe_name}>
+
+ <{assign var=start_pos value=$timeframe.left+$timeframe.width}>
+ <{/foreach}>
+
+
+ <{/if}>
+
<{section name=hour loop=24 start=0 step=1}>
<{assign var=hour value=$smarty.section.hour.index}>
@@ -31,7 +53,7 @@
<{foreach name="location_list" key="location_id" item="location" from=$action.location_list}>
-
+
<{if ($action.reserve_data.$location_id.$view_date) }>
<{include file="reservation_view_main_list_location.html"}>
<{else}>
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
index 68e7b92..371669b 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_init_weekly.html
@@ -1,7 +1,7 @@
<{strip}>
<{assign var="lang_year" value=$lang.reservation_monthly_year_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
-<{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
+<{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$action.current_timestamp`"}>
<{include file="reservation_main_header_weekly.html"}>
@@ -12,6 +12,11 @@
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+ <{/if}>
@@ -24,7 +29,7 @@
<{/if}>
<{assign var="index" value=$smarty.section.timestamp.iteration-1}>
<{assign var="wday" value="w"|date:"`$timestamp`"}>
-
+
<{assign var="wday_data" value=$action.week_list.$wday}>
<{assign var="lang_wday" value=$lang.reservation_wday_format|smarty:nodefaults|sprintf:"`$wday_data.name`"}>
<{assign var="lang_day" value=$lang.reservation_weekly_format|smarty:nodefaults|date:"`$timestamp`"}>
@@ -32,7 +37,7 @@
<{include file="reservation_main_set_day_class.html" assign="day_class" view_date=$action.view_date set_date=$date wday=$wday}>
<{assign var="lang_year" value=$lang.reservation_monthly_year_format|smarty:nodefaults|date:"`$timestamp`"}>
- <{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$timestamp`"}>
+ <{assign var="lang_month" value=$lang.reservation_monthly_month_format|smarty:nodefaults|date:"`$timestamp`"}>
@@ -60,7 +65,24 @@
<{assign var=hour value=$smarty.section.hour.index}>
-
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON && ($smarty.section.hour.first)}>
+
+
+ <{assign var=start_pos value=0}>
+ <{foreach from=$action.timeframe_list item=timeframe}>
+ <{assign var=spacer_height value=`$timeframe.top-$start_pos`}>
+
+
transparent<{else}><{$timeframe.timeframe_color}><{/if}>" title="<{$timeframe.start_time|timezone_date:false:$lang._short_time_format}><{$lang.reservation_time_pause}><{$timeframe.end_time|timezone_date:false:$lang._short_time_format}>">
+
<{include file="reservation_main_addreserve.html" view_date=$first_date timeframe_id=`$timeframe.timeframe_id`}>
+ <{$timeframe.timeframe_name}>
+
+ <{assign var=start_pos value=$timeframe.top+$timeframe.height}>
+ <{/foreach}>
+
+ <{/if}>
+
+
<{$lang.reservation_time_format|smarty:nodefaults|sprintf:$hour}>
<{include file="reservation_main_addreserve.html" view_date=$first_date hour=$hour}>
@@ -71,8 +93,8 @@
<{section name=timestamp loop=$action.end_timestamp start=$action.start_timestamp step=86400}>
<{assign var="timestamp" value=$smarty.section.timestamp.index}>
<{assign var="date" value="Ymd"|date:$smarty.section.timestamp.index}>
-
-
+
+
<{if ($action.reserve_data.$date) }>
<{include file="./reservation_view_main_list_weekly.html"}>
@@ -81,13 +103,18 @@
<{/if}>
-
+
<{/section}>
<{/if}>
<{/section}>
+ <{if $action.reserve_block.display_timeframe == $smarty.const._ON}>
+
+
+ <{/if}>
+
diff --git a/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html b/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
index 342f203..dcf37ea 100644
--- a/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
+++ b/html/webapp/modules/reservation/templates/default/reservation_view_main_reserve_regist.html
@@ -19,7 +19,7 @@
<{include file="reservation_reserve_regist_location.html" reserve=$action.reserve|smarty:nodefaults}>
-
+
<{if ($action.details_flag == _ON) }>
<{include file="reservation_reserve_regist_contact.html" reserve=$action.reserve|smarty:nodefaults}>
@@ -36,7 +36,7 @@
<{/if}>
<{/if}>
-
+
<{if ($action.mail_send == _ON) }>
<{include file="reservation_reserve_regist_mail.html" reserve=$action.reserve|smarty:nodefaults}>
@@ -82,6 +82,10 @@
reservationCls["<{$id}>"].initRepeat();
<{/if}>
reservationCls["<{$id}>"].switchTime24Reserve($("reservation_form<{$id}>"));
+ if($("reservation_start_timeframe<{$id}>")) {
+ reservationCls["<{$id}>"].switchTimeframe($("reservation_start_timeframe<{$id}>"), $("reservation_form<{$id}>"), "start" );
+ reservationCls["<{$id}>"].switchTimeframe($("reservation_end_timeframe<{$id}>"), $("reservation_form<{$id}>"), "end" );
+ }
commonCls.focus("<{$id}>");
diff --git a/html/webapp/modules/reservation/update/Update.class.php b/html/webapp/modules/reservation/update/Update.class.php
index 2f47175..4cf030a 100644
--- a/html/webapp/modules/reservation/update/Update.class.php
+++ b/html/webapp/modules/reservation/update/Update.class.php
@@ -217,6 +217,39 @@ function execute()
}
}
+ // reservation_blockにカラムを追加
+ $adodb = $this->db->getAdoDbObject();
+ $metaColumns = $adodb->MetaColumns($this->db->getPrefix().'reservation_block');
+ if(!isset($metaColumns['DISPLAY_TIMEFRAME'])) {
+ $sql = "ALTER TABLE `".$this->db->getPrefix()."reservation_block` ".
+ " ADD `display_timeframe` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `display_type` ;";
+ $result = $this->db->execute($sql);
+ if($result === false) return false;
+ }
+ // reservation_timeframeテーブルを追加
+ $metaTables = $adodb->MetaTables();
+ if (!in_array($this->db->getPrefix()."reservation_timeframe", $metaTables)) {
+ $sql = "CREATE TABLE `".$this->db->getPrefix()."reservation_timeframe` (" .
+ " `timeframe_id` int(11) NOT NULL default '0'," .
+ " `timeframe_name` varchar(255) default NULL," .
+ " `start_time` varchar(14) NOT NULL default ''," .
+ " `end_time` varchar(14) NOT NULL default ''," .
+ " `timezone_offset` float(3,1) NOT NULL default '0.0'," .
+ " `timeframe_color` varchar(16) NOT NULL default ''," .
+ " `insert_time` varchar(14) NOT NULL default ''," .
+ " `insert_site_id` varchar(40) NOT NULL default ''," .
+ " `insert_user_id` varchar(40) NOT NULL default ''," .
+ " `insert_user_name` varchar(255) NOT NULL default ''," .
+ " `update_time` varchar(14) NOT NULL default ''," .
+ " `update_site_id` varchar(40) NOT NULL default ''," .
+ " `update_user_id` varchar(40) NOT NULL default ''," .
+ " `update_user_name` varchar(255) NOT NULL default ''," .
+ " PRIMARY KEY (`timeframe_id`)" .
+ ") ENGINE=MyISAM;";
+ $result = $this->db->execute($sql);
+ if($result === false) return false;
+ }
+
return true;
}
}
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php
new file mode 100644
index 0000000..0ced79b
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeAdjustment.class.php
@@ -0,0 +1,76 @@
+getComponent("Request");
+ $reservationView =& $container->getComponent("reservationView");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+ $block = $request->getParameter('reserve_block');
+ if($block['display_timeframe'] == _OFF) {
+ return;
+ }
+
+ if ($actionName == "reservation_view_main_reserve_add") {
+ if(!isset($attributes['timeframe_id'])) {
+ return;
+ }
+ $timeframe_id = $attributes['timeframe_id'];
+ $timeframe = $reservationView->getTimeframe($timeframe_id);
+ if($timeframe && is_array($timeframe)) {
+ $request->setParameter('start_hour', $timeframe['start_time_view_hour']);
+ $request->setParameter('start_minute', $timeframe['start_time_view_min']);
+ $request->setParameter('end_hour', $timeframe['end_time_view_hour']);
+ $request->setParameter('end_minute', $timeframe['end_time_view_min']);
+ $request->setParameter('start_timeframe_id', $timeframe['timeframe_id']);
+ $request->setParameter('end_timeframe_id', $timeframe['timeframe_id']);
+ $request->setParameter('start_timeframe', $timeframe);
+ $request->setParameter('end_timeframe', $timeframe);
+ }
+ }
+ elseif($actionName == "reservation_view_main_reserve_modify" ||
+ $actionName == "reservation_view_main_reserve_details") {
+ $reserve = $request->getParameter("reserve");
+ if($reserve) {
+ $start_timeframe = $reservationView->getTimeframeByStartTime($reserve['start_time']);
+ if($start_timeframe) {
+ $request->setParameter('start_timeframe_id', $start_timeframe['timeframe_id']);
+ $request->setParameter('start_timeframe', $start_timeframe);
+ }
+ $end_timeframe = $reservationView->getTimeframeByEndTime($reserve['end_time']);
+ if($end_timeframe) {
+ $request->setParameter('end_timeframe_id', $end_timeframe['timeframe_id']);
+ $request->setParameter('end_timeframe', $end_timeframe);
+ }
+ }
+ }
+ return;
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php
new file mode 100644
index 0000000..df6e532
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeListView.class.php
@@ -0,0 +1,51 @@
+getComponent("reservationView");
+
+ $request =& $container->getComponent("Request");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+
+ if($actionName == 'reservation_view_main_init') {
+ $divided_flag = true;
+ }
+ else {
+ $divided_flag = false;
+ }
+ $timeframe_list = $reservationView->getTimeframes($divided_flag);
+ $request->setParameter('timeframe_list', $timeframe_list);
+
+ $request->setParameter('timeframe_list_count', count($timeframe_list));
+
+ return;
+ }
+}
+?>
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php
new file mode 100644
index 0000000..13b4057
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeTimetable.class.php
@@ -0,0 +1,57 @@
+getComponent("Request");
+ $reservationView =& $container->getComponent("reservationView");
+
+ // このValidatorの前にlocationTimetable Validatorが実行されていることが前提
+
+ // 指定された時刻をGMTに修正したうえでチェック
+ $start_time = timezone_date($request->getParameter('start_time'), true, 'His');
+ $end_time = timezone_date($request->getParameter('end_time'), true, 'His');
+
+ // 0:00-24:00 の場合だけあり得る
+ if($start_time == $end_time) {
+ $end_time = strval(intval($end_time)+240000);
+ }
+
+ $ret = $reservationView->getTimeframeDuplicate($attributes['timeframe_id'], $start_time, $end_time);
+ if($ret == false) {
+ return $errStr;
+ }
+
+ // 差分チェックは入力データで行う
+ $diff = $reservationView->TimeDiff($request->getParameter('start_time'), $request->getParameter('end_time'));
+ if ($diff < RESERVATION_SELECT_MIN_TIME) {
+ return RESERVATION_ERR_TIMEFRAME_MIN_TIME;
+ }
+
+ return;
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php b/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php
new file mode 100644
index 0000000..bc313f1
--- /dev/null
+++ b/html/webapp/modules/reservation/validator/Validator_TimeframeView.class.php
@@ -0,0 +1,55 @@
+getComponent("reservationView");
+
+ $request =& $container->getComponent("Request");
+
+ $actionChain =& $container->getComponent("ActionChain");
+ $actionName = $actionChain->getCurActionName();
+
+ if(!isset($attributes['timeframe_id']) || empty($attributes['timeframe_id'])) {
+ if($actionName == 'reservation_action_edit_timeframe_delete') {
+ return $errStr;
+ }
+ else {
+ // 新規追加
+ return;
+ }
+ }
+ $timeframe = $reservationView->getTimeframe($attributes['timeframe_id']);
+ if(!$timeframe) {
+ return $errStr;
+ }
+
+ $request->setParameter('timeframe', $timeframe);
+
+ return;
+ }
+}
+?>
diff --git a/html/webapp/modules/reservation/view/edit/maple.ini b/html/webapp/modules/reservation/view/edit/maple.ini
index da59ff0..7087e7a 100644
--- a/html/webapp/modules/reservation/view/edit/maple.ini
+++ b/html/webapp/modules/reservation/view/edit/maple.ini
@@ -5,6 +5,7 @@ css_tab = "comp:{$theme_name}/comp_tabset.css"
_change_display = "define:reservation_view_edit_style_init"
reservation_location_manage = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_location_init');"
reservation_location_add = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_location_add');"
+reservation_timeframe = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_timeframe');"
reservation_mail = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_mail');"
reservation_csv_import = "_user_auth_id==_AUTH_ADMIN->commonCls.sendView('<{$id}>','reservation_view_edit_import_init');"
_edit_design = "define:_EDIT_DESIGN_METHOD"
diff --git a/html/webapp/modules/reservation/view/edit/style/init/Init.class.php b/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
index 53b0cea..c734ce5 100644
--- a/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
+++ b/html/webapp/modules/reservation/view/edit/style/init/Init.class.php
@@ -20,6 +20,7 @@ class Reservation_View_Edit_Style_Init extends Action
var $location_count = null;
var $reserve_block = null;
var $location_count_list = null;
+ var $timeframe_list_count = null;
/**
* execute処理
diff --git a/html/webapp/modules/reservation/view/edit/style/init/maple.ini b/html/webapp/modules/reservation/view/edit/style/init/maple.ini
index 548a74a..88730d1 100644
--- a/html/webapp/modules/reservation/view/edit/style/init/maple.ini
+++ b/html/webapp/modules/reservation/view/edit/style/init/maple.ini
@@ -1,6 +1,9 @@
[HeaderMenu]
1,_change_display = "define:auto"
+[SmartyAssign::reservationStyleAssign]
+global = timezone.ini
+
[AllowIdList]
room_id_arr = "ALLOW_ROOM_ID"
@@ -10,6 +13,7 @@ key:block_id.reservation.block:g = "1:lang._invalid_input"
key:reserve_block,location_count.reservation.locationExists:g = "1:lang.reservation_nolocation"
key:reserve_block,category_list.reservation.categoryView:g = "1:lang._invalid_input"
key:reserve_block.reservation.locationView:g = "1:lang._invalid_input"
+.reservation.TimeframeListView = "1:lang._invalid_input"
[View]
define:theme = 1
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php b/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php
new file mode 100644
index 0000000..5c1cc5f
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/Timeframe.class.php
@@ -0,0 +1,36 @@
+configView->getConfigByConfname($this->module_id, 'timeframe_color');
+ if($config) {
+ $this->timeframe_colors = explode('|', $config['conf_value']);
+ }
+
+ $this->timezone_list = explode("|", RESERVATION_DEF_TIMEZONE);
+
+ $this->week_list = $this->reservationView->getLocationWeekArray();
+
+ return 'success';
+ }
+}
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini b/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini
new file mode 100644
index 0000000..a0a305e
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/entry/maple.ini
@@ -0,0 +1,10 @@
+[HeaderMenu]
+mode = "nobuild"
+
+[ValidateDef]
+key:timeframe_id.reservation.TimeframeView = "1:lang._invalid_input"
+
+
+[View]
+define:theme_name = "system"
+success = "reservation_view_edit_timeframe_entry.html"
\ No newline at end of file
diff --git a/html/webapp/modules/reservation/view/edit/timeframe/maple.ini b/html/webapp/modules/reservation/view/edit/timeframe/maple.ini
new file mode 100644
index 0000000..739bcba
--- /dev/null
+++ b/html/webapp/modules/reservation/view/edit/timeframe/maple.ini
@@ -0,0 +1,17 @@
+[SmartyAssign::reservationTimeframeAssign]
+global = timezone.ini
+
+[ValidateDef]
+authcheck = "1,_user_auth_id==_AUTH_ADMIN:lang._invalid_auth"
+.reservation.TimeframeListView = "1:lang._invalid_input"
+
+[HeaderMenu]
+1,reservation_timeframe = "define:auto"
+
+[Action]
+configView = "ref:configView"
+reservationView = "ref:reservationView"
+
+[View]
+define:theme = 1
+success = "reservation_view_edit_timeframe.html"
diff --git a/html/webapp/modules/reservation/view/main/init/Init.class.php b/html/webapp/modules/reservation/view/main/init/Init.class.php
index ea49c6c..f93584f 100644
--- a/html/webapp/modules/reservation/view/main/init/Init.class.php
+++ b/html/webapp/modules/reservation/view/main/init/Init.class.php
@@ -50,6 +50,9 @@ class Reservation_View_Main_Init extends Action
var $prev_day = null;
var $input_date = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+
/**
* execute実行
*
@@ -64,7 +67,7 @@ function execute()
if ($this->location_count == 0) {
return 'noLocation';
}
-
+
switch ($this->reserve_block["display_type"]) {
case RESERVATION_DEF_MONTHLY:
return 'successMonthly';
diff --git a/html/webapp/modules/reservation/view/main/init/maple.ini b/html/webapp/modules/reservation/view/main/init/maple.ini
index 12b010f..0d14393 100644
--- a/html/webapp/modules/reservation/view/main/init/maple.ini
+++ b/html/webapp/modules/reservation/view/main/init/maple.ini
@@ -1,3 +1,6 @@
+[SmartyAssign::reservationInitAssign]
+global = timezone.ini
+
[AllowIdList]
room_id_arr = "ALLOW_ROOM_ID"
@@ -13,6 +16,7 @@ key:category_list.reservation.categoryView:g = "1:lang.reservation_no_category"
key:category_id.reservation.locationView:g = "1:lang.reservation_select_nolocation"
key:start_date,end_date.reservation.holidayView:g = "1:lang.reservation_error_holiday"
key:start_date,end_date.reservation.reserveView:g = "1:lang.reservation_error_reserve"
+.reservation.TimeframeListView:g = "1:lang._invalid_input"
[Action]
session = "ref:Session"
diff --git a/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php b/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
index 1b18cfe..ea82db5 100644
--- a/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/add/Add.class.php
@@ -29,6 +29,11 @@ class Reservation_View_Main_Reserve_Add extends Action
var $location_list = null;
var $location_count = null;
var $location_count_list = null;
+ var $reserve_block = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+ var $start_timeframe_id = null;
+ var $end_timeframe_id = null;
// Filterから受け取るため
var $room_arr = null;
diff --git a/html/webapp/modules/reservation/view/main/reserve/add/maple.ini b/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
index b59c882..08b162f 100644
--- a/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/add/maple.ini
@@ -8,8 +8,11 @@ room_arr = "ALLOW_ROOM_ARR"
room_id_arr = "ALLOW_ROOM_ID"
[ValidateDef]
+.reservation.TimeframeListView = "1:lang._invalid_input"
reserve_date.date:g = "1:lang._invalid_date,lang.reservation_reserve_time"
key:date.reservation.date:g = "1:lang._invalid_input"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+key:timeframe_id.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
key:time,start_hour,start_minute.reservation.time:g = "1:lang.reservation_reserve_time"
key:time,end_hour,end_minute.reservation.time:g = "1:lang.reservation_reserve_time"
key:location_id.reservation.locationExists = "1:lang._invalid_input"
diff --git a/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php b/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
index 4ddb6a5..26adf50 100644
--- a/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/details/Details.class.php
@@ -17,6 +17,9 @@ class Reservation_View_Main_Reserve_Details extends Action
// validatorから受け取るため
var $reserve = null;
var $rrule_reserve_id = null;
+ var $reserve_block = null;
+ var $start_timeframe = null;
+ var $end_timeframe = null;
/**
* execute実行
diff --git a/html/webapp/modules/reservation/view/main/reserve/details/maple.ini b/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
index 0ff8a8e..042a766 100644
--- a/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/details/maple.ini
@@ -8,6 +8,8 @@ room_id_arr = "ALLOW_ROOM_ID"
key:reserve_id.reservation.reserveExists:g = "1:lang._invalid_auth"
key:reserve_id.reservation.reserveView:g = "1:lang._invalid_auth"
key:location_id.reservation.locationExists:g = "1:lang._invalid_auth"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
[Action]
reservationView = "ref:reservationView"
diff --git a/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php b/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
index a70db48..1dd042c 100644
--- a/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
+++ b/html/webapp/modules/reservation/view/main/reserve/modify/Modify.class.php
@@ -22,10 +22,15 @@ class Reservation_View_Main_Reserve_Modify extends Action
var $location = null;
var $allow_add_rooms = null;
var $category_list = null;
+ var $reserve_block = null;
var $location_id = null;
var $location_list = null;
var $location_count = null;
var $location_count_list = null;
+ var $timeframe_list = null;
+ var $timeframe_list_count = null;
+ var $start_timeframe_id = null;
+ var $end_timeframe_id = null;
// Filterから受け取るため
var $room_arr = null;
diff --git a/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini b/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
index f569159..793693e 100644
--- a/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
+++ b/html/webapp/modules/reservation/view/main/reserve/modify/maple.ini
@@ -13,6 +13,9 @@ key:reserve_id.reservation.reserveView:g = "1:lang._invalid_auth"
key:location_id.reservation.locationExists:g = "1:lang._invalid_auth"
key:category_list.reservation.categoryView:g = "1:lang.reservation_no_category"
key:category_id,location_id.reservation.locationView:g = "1:lang.reservation_select_nolocation"
+key:block_id.reservation.block:g = "1:lang._invalid_input"
+.reservation.TimeframeListView = "1:lang._invalid_input"
+.reservation.timeframeAdjustment:g = "1:lang._invalid_input"
[HeaderInc]
textarea_css = "comp:{$theme_name}/comp_textarea.css"
From 964f92a83bb337380bb7b4d0d826128d999eb1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E7=94=B0=E5=8F=A3=E3=80=80=E6=BA=80?=
Date: Wed, 17 Jul 2013 10:54:48 +0900
Subject: [PATCH 007/109] =?UTF-8?q?=E4=BC=9A=E5=93=A1=E7=99=BB=E9=8C=B2?=
=?UTF-8?q?=E3=81=A7=E6=80=A7=E5=88=A5=E3=82=92=E5=BF=85=E9=A0=88=E3=81=AB?=
=?UTF-8?q?=E3=81=97=E3=81=9F=E6=99=82=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC?=
=?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
エラーメッセージが「7:性別を入力してください。」
→「性別を入力してください。」になるように修正
---
html/webapp/modules/login/files/js/default/login.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/webapp/modules/login/files/js/default/login.js b/html/webapp/modules/login/files/js/default/login.js
index 42f0be6..3aa4d46 100644
--- a/html/webapp/modules/login/files/js/default/login.js
+++ b/html/webapp/modules/login/files/js/default/login.js
@@ -92,7 +92,7 @@ clsLogin.prototype = {
commonCls.alert(alert_res);
commonCls.focus(focus_el);
} else {
- commonCls.alert(res);
+ commonCls.alert(alert_res);
}
} else {
commonCls.alert(res);
From 6b0dc5af2af6928bc717e63b3a57577fe5beffce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9F=E7=94=B0=E5=8F=A3=E3=80=80=E6=BA=80?=
Date: Wed, 17 Jul 2013 11:23:52 +0900
Subject: [PATCH 008/109] =?UTF-8?q?#80=20=E4=BD=B5=E3=81=9B=E3=81=A6?=
=?UTF-8?q?=E4=BC=9A=E5=93=A1=E7=AE=A1=E7=90=86=E3=81=8B=E3=82=89=E3=81=AE?=
=?UTF-8?q?=E4=BC=9A=E5=93=A1=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AE=E5=90=8C?=
=?UTF-8?q?=E6=A7=98=E3=81=AE=E4=B8=8D=E5=82=99=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/modules/user/files/js/default/user.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/webapp/modules/user/files/js/default/user.js b/html/webapp/modules/user/files/js/default/user.js
index 63990a9..67014b6 100644
--- a/html/webapp/modules/user/files/js/default/user.js
+++ b/html/webapp/modules/user/files/js/default/user.js
@@ -624,7 +624,7 @@ clsUser.prototype = {
focus_el.focus();
if(focus_el.type == "text") focus_el.select();
} else {
- commonCls.alert(res);
+ commonCls.alert(alert_res);
}
} else {
commonCls.alert(res);
From 2706aa29d22af760eb6737a4ec9452d7c55dd5a1 Mon Sep 17 00:00:00 2001
From: Rika Fujiwara
Date: Thu, 18 Jul 2013 17:32:07 +0900
Subject: [PATCH 009/109] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=A0=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E6=A9=9F=E8=83=BD=E3=81=AB=E6=A8=A9=E9=99=90=E8=A8=AD?=
=?UTF-8?q?=E5=AE=9A=E3=81=AECSV=E3=82=A8=E3=82=AF=E3=82=B9=E3=83=9D?=
=?UTF-8?q?=E3=83=BC=E3=83=88=E6=A9=9F=E8=83=BD=E3=81=A8=E3=82=A4=E3=83=B3?=
=?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD?=
=?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../room/action/admin/export/Export.class.php | 79 +++++
.../room/action/admin/export/maple.ini | 21 ++
.../admin/import/confirm/Confirm.class.php | 203 +++++++++++++
.../action/admin/import/confirm/dicon.ini | 3 +
.../action/admin/import/confirm/maple.ini | 30 ++
.../modules/room/components/View.class.php | 204 +++++++++++++
html/webapp/modules/room/config/main.ini | 9 +-
.../modules/room/files/css/default/style.css | 54 +++-
html/webapp/modules/room/files/js/room.js | 85 ++++++
.../modules/room/language/chinese/main.ini | 65 +++-
.../modules/room/language/english/main.ini | 65 +++-
.../modules/room/language/japanese/main.ini | 65 +++-
.../room_action_admin_import_confirm.html | 55 ++++
.../default/room_view_admin_import.html | 98 +++++++
.../room_view_admin_import_confirm.html | 68 +++++
.../room_view_admin_regist_selectusers.html | 8 +
.../default/room_view_admin_roomlist.html | 6 +
.../Validator_ImportRoomIdCheck.class.php | 55 ++++
.../room/view/admin/export/Export.class.php | 168 +++++++++++
.../modules/room/view/admin/export/dicon.ini | 3 +
.../modules/room/view/admin/export/maple.ini | 26 ++
.../room/view/admin/import/Import.class.php | 85 ++++++
.../admin/import/confirm/Confirm.class.php | 60 ++++
.../room/view/admin/import/confirm/maple.ini | 8 +
.../modules/room/view/admin/import/maple.ini | 20 ++
.../view/admin/import/upload/Upload.class.php | 277 ++++++++++++++++++
.../room/view/admin/import/upload/dicon.ini | 4 +
.../room/view/admin/import/upload/maple.ini | 24 ++
.../regist/selectusers/Selectusers.class.php | 17 +-
29 files changed, 1858 insertions(+), 7 deletions(-)
create mode 100644 html/webapp/modules/room/action/admin/export/Export.class.php
create mode 100644 html/webapp/modules/room/action/admin/export/maple.ini
create mode 100644 html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php
create mode 100644 html/webapp/modules/room/action/admin/import/confirm/dicon.ini
create mode 100644 html/webapp/modules/room/action/admin/import/confirm/maple.ini
create mode 100644 html/webapp/modules/room/components/View.class.php
create mode 100644 html/webapp/modules/room/templates/default/room_action_admin_import_confirm.html
create mode 100644 html/webapp/modules/room/templates/default/room_view_admin_import.html
create mode 100644 html/webapp/modules/room/templates/default/room_view_admin_import_confirm.html
create mode 100644 html/webapp/modules/room/validator/Validator_ImportRoomIdCheck.class.php
create mode 100644 html/webapp/modules/room/view/admin/export/Export.class.php
create mode 100644 html/webapp/modules/room/view/admin/export/dicon.ini
create mode 100644 html/webapp/modules/room/view/admin/export/maple.ini
create mode 100644 html/webapp/modules/room/view/admin/import/Import.class.php
create mode 100644 html/webapp/modules/room/view/admin/import/confirm/Confirm.class.php
create mode 100644 html/webapp/modules/room/view/admin/import/confirm/maple.ini
create mode 100644 html/webapp/modules/room/view/admin/import/maple.ini
create mode 100644 html/webapp/modules/room/view/admin/import/upload/Upload.class.php
create mode 100644 html/webapp/modules/room/view/admin/import/upload/dicon.ini
create mode 100644 html/webapp/modules/room/view/admin/import/upload/maple.ini
diff --git a/html/webapp/modules/room/action/admin/export/Export.class.php b/html/webapp/modules/room/action/admin/export/Export.class.php
new file mode 100644
index 0000000..37a03ab
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/export/Export.class.php
@@ -0,0 +1,79 @@
+>ルーム一覧>>参加者修正>>エクスポート>>準備
+ *
+ * @package NetCommons
+ * @author Noriko Arai,Ryuji Masukawa
+ * @copyright 2006-2007 NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @project NetCommons Project, supported by National Institute of Informatics
+ * @access public
+ */
+
+class Room_Action_Admin_Export extends Action
+{
+ // リクエストパラメータをセットするため
+ var $parent_page_id = null;
+ var $edit_current_page_id = null;
+
+ // VAlidatorでセット
+ var $page = null;
+
+ // 使用コンポーネントを受け取るため
+ var $session = null;
+ var $db = null;
+ var $actionChain = null;
+
+
+ // 値をセットするため
+
+ /**
+ * execute実行
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $this->session->setParameter(array('room', 'export', 'current_page_id'), $this->edit_current_page_id);
+ $this->session->setParameter(array('room', 'export', 'current_page_name'), $this->page['page_name']);
+
+ $select_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_select_str'));
+ $from_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_from_str'));
+ $add_from_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_add_from_str'));
+ $where_str =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_where_str'));
+ $add_where_str =& $this->session->getParameter(array('room', $this->edit_current_page_id,'selected_add_where_str'));
+ $export_add_where_str = ' AND {authorities}.user_authority_id != ?';
+ $params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_params'));
+ $from_params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_from_params'));
+ $where_params =& $this->session->getParameter(array('room', $this->edit_current_page_id, 'selected_where_params'));
+ if(!is_array($from_params)) $from_params = array();
+ if(!is_array($where_params)) $where_params = array();
+
+ $export_where_params = array(_AUTH_ADMIN);
+
+ $sql_params = array_merge((array)$params, (array)$from_params, (array)$where_params, (array)$export_where_params);
+
+ $sql = $select_str.$from_str.$add_from_str.$where_str.$add_where_str.$export_add_where_str;
+
+ //
+ // レコード数取得
+ //
+ $count_sql = 'SELECT COUNT(*) FROM (' . $select_str.$from_str.$add_from_str.$where_str.$add_where_str.$export_add_where_str . ') AS T';
+ $count_result =& $this->db->execute($count_sql, $sql_params, null, null, false);
+ if($count_result === false) {
+ $this->db->addError();
+ return 'error';
+ }
+
+ $data_count = intval($count_result[0][0]);
+ if($data_count == 0) {
+ $errorList =& $this->actionChain->getCurErrorList();
+ $errorList->add(get_class($this), ROOM_EXPORT_NONE);
+ return 'error';
+ }
+
+ return 'success';
+ }
+}
+?>
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/export/maple.ini b/html/webapp/modules/room/action/admin/export/maple.ini
new file mode 100644
index 0000000..f5ba385
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/export/maple.ini
@@ -0,0 +1,21 @@
+[TokenExtra::TokenExtraExport]
+mode="check"
+action = "room_view_admin_regist_selectusers"
+
+[ValidateDef]
+parent_page_id.required ="1:lang._invalid_input"
+edit_current_page_id.required ="1:lang._invalid_input"
+parent_page_id,edit_current_page_id.room.RoomRegist = "1,export:lang._invalid_input"
+
+[Action]
+session = "ref:Session"
+db = "ref:DbObject"
+actionChain = "ref:ActionChain"
+
+
+[View]
+define:theme = 0
+success = "main:true.html"
+;success = "location:room_view_admin_export"
+;success = "location_script:"
+error = "main:error.html"
diff --git a/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php b/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php
new file mode 100644
index 0000000..d2bd4f6
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/Confirm.class.php
@@ -0,0 +1,203 @@
+authoritiesView->getAuthorities(array('(system_flag ='. _ON . ' OR user_authority_id = '. _AUTH_MODERATE. ') AND user_authority_id != '. _AUTH_ADMIN => null));
+ $this->authorities = array();
+ foreach($tmp_authorities as $a) {
+ $a['new_total'] = 0;
+ $a['added_num'] = 0;
+ $this->authorities[$a['role_authority_id']] = $a;
+ }
+
+ $errorList =& $this->actionChain->getCurErrorList();
+ $warn_cnt = 0;
+
+ // 不要セッション情報初期化
+ $this->session->removeParameter(array('room', 'import', 'count'));
+ $this->session->removeParameter(array('room', 'import', 'warn'));
+
+ // メンバ変数初期化
+ $this->added_auth_member_num = array();
+ $this->total_auth_member_num = array();
+ $this->deleted_auth_member_num = 0;
+
+ // デフォルト参加権限定義情報を取得しておきます
+ $config = $this->configView->getConfigByCatid(_SYS_CONF_MODID, _GENERAL_CONF_CATID);
+ if($this->page['default_entry_flag'] == _OFF) {
+ $default_role_auth = _ROLE_AUTH_OTHER;
+ }
+ else {
+ if($this->page['space_type'] == _SPACE_TYPE_PUBLIC) {
+ $default_role_auth = $config['default_entry_role_auth_public']['conf_value'];
+ }
+ else {
+ $default_role_auth = $config['default_entry_role_auth_group']['conf_value'];
+ }
+ }
+
+ // 変更ユーザ情報、対象ルームユーザ情報取得
+ $change_users = $this->session->getParameter(array('room', 'import', 'data'));
+ $users = $this->roomView->getRoomUsersList($this->page, $this->parent_page, $this->authorities);
+
+ $my_handle = $this->session->getParameter('_handle');
+
+ foreach($change_users as $handle=>$new_auth) {
+ // 対象者が存在しない会員だった
+ // 管理者権限だった
+ // 自分だった
+ // 警告追加＆スキップ
+ if($handle==$my_handle
+ || !isset($users[$handle])
+ || $users[$handle]['user_authority_id'] == _AUTH_ADMIN ) {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ continue;
+ }
+ $where_params = array(
+ 'room_id' => $this->edit_current_page_id,
+ 'user_id' => $users[$handle]['user_id']
+ );
+ $ins_params = array(
+ 'room_id' => $this->edit_current_page_id,
+ 'user_id' => $users[$handle]['user_id'],
+ 'role_authority_id' => $new_auth,
+ 'createroom_flag' => _OFF
+ );
+ $upd_params = array(
+ 'role_authority_id' => $new_auth
+ );
+ $del_upd_params = array(
+ 'role_authority_id' => $new_auth,
+ 'createroom_flag' => _OFF
+ );
+
+ // 不参加に
+ if($new_auth == _ROLE_AUTH_OTHER) {
+ if($default_role_auth==$new_auth) {
+ $resultPageUserLink = $this->pagesAction->delPageUsersLink($where_params);
+ }
+ else {
+ if($users[$handle]['createroom_flag']==_OFF && $users[$handle]['authority_id']==$default_role_auth) {
+ $resultPageUserLink = $this->pagesAction->insPageUsersLink($ins_params);
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($del_upd_params, $where_params);
+ }
+ }
+
+ // 対象が親ルームの場合は、全てのサブルームからも削除
+ if($this->page['space_type']!=_SPACE_TYPE_PUBLIC && $this->page['thread_num']==1) {
+ $subroom_where_params = array($this->edit_current_page_id, $users[$handle]['user_id']);
+ $sql = ' DELETE FROM {pages_users_link} WHERE room_id IN (SELECT page_id FROM {pages} WHERE parent_id=? AND page_id=room_id) AND user_id = ?';
+ $this->db->execute($sql, $subroom_where_params);
+ }
+ if($resultPageUserLink) {
+ $this->deleted_auth_member_num++;
+ }
+ }
+ // 権限変更
+ else {
+ if(!isset($users[$handle]['permitted_auth'][$new_auth])
+ || $users[$handle]['permitted_auth'][$new_auth]==_OFF) {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ continue;
+ }
+ // デフォルト権限での参加に変更
+ if($new_auth==$default_role_auth) {
+ // しかし現状ルーム作成権限がON
+ if($users[$handle]['createroom_flag']==_ON) {
+ // ならばUPDATEでレコード温存
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ // ルーム作成権限OFF
+ else {
+ // ならばレコード削除
+ $resultPageUserLink = $this->pagesAction->delPageUsersLink($where_params);
+ }
+ }
+ else {
+ if($users[$handle]['authority_id']==$default_role_auth) {
+ // しかし現状ルーム作成権限がON
+ if($users[$handle]['createroom_flag']==_ON) {
+ // ならば既にレコードあり。UPDATE
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->insPageUsersLink($ins_params);
+ }
+ }
+ else {
+ $resultPageUserLink = $this->pagesAction->updPageUsersLink($upd_params, $where_params);
+ }
+ }
+ if($resultPageUserLink) {
+ $this->authorities[$new_auth]['added_num']++;
+ }
+ }
+ if($resultPageUserLink) {
+ $users[$handle]['authority_id'] = $new_auth;
+ }
+ else {
+ $this->session->setParameter(array('room', 'import', 'warn', $warn_cnt++), $handle);// 警告追加しスキップ
+ }
+ }
+
+ foreach($users as $handle=>$user) {
+ if(!isset($this->authorities[$user['authority_id']])) {
+ continue;
+ }
+ $this->authorities[$user['authority_id']]['new_total']++;
+ }
+
+ foreach($this->authorities as $a) {
+ $this->added_auth_member_num[$a['role_authority_name']] = $a['added_num'];
+ $this->total_auth_member_num[$a['role_authority_name']] = $a['new_total'];
+ }
+ return 'success';
+ }
+}
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/import/confirm/dicon.ini b/html/webapp/modules/room/action/admin/import/confirm/dicon.ini
new file mode 100644
index 0000000..fc26ae6
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/dicon.ini
@@ -0,0 +1,3 @@
+[DIContainer]
+roomView = "modules://room.components.view"
+pagesAction = "pages.Action"
diff --git a/html/webapp/modules/room/action/admin/import/confirm/maple.ini b/html/webapp/modules/room/action/admin/import/confirm/maple.ini
new file mode 100644
index 0000000..75da971
--- /dev/null
+++ b/html/webapp/modules/room/action/admin/import/confirm/maple.ini
@@ -0,0 +1,30 @@
+[DIContainer]
+filename_import = "dicon.ini"
+
+[TokenExtra]
+mode="check"
+action="room_view_admin_import_confirm"
+
+[ValidateDef]
+authcheck = "1,_auth_id>=_AUTH_CHEIF:lang._invalid_auth"
+parent_page_id,edit_current_page_id.room.ImportRoomIdCheck = "1:lang._invalid_input"
+parent_page_id.required ="1:lang._invalid_input"
+edit_current_page_id.required ="1:lang._invalid_input"
+parent_page_id,edit_current_page_id.room.RoomRegist = "1,export:lang._invalid_input"
+
+[Action]
+session = "ref:Session"
+configView = "ref:configView"
+usersView = "ref:usersView"
+pagesView = "ref:pagesView"
+pagesAction = "ref:pagesAction"
+roomView = "ref:roomView"
+authoritiesView = "ref:authoritiesView"
+actionChain = "ref:ActionChain"
+db = "ref:DbObject"
+
+[View]
+define:theme = 1
+success = "room_action_admin_import_confirm.html"
+error = "main:error.html"
+
diff --git a/html/webapp/modules/room/components/View.class.php b/html/webapp/modules/room/components/View.class.php
new file mode 100644
index 0000000..29eec87
--- /dev/null
+++ b/html/webapp/modules/room/components/View.class.php
@@ -0,0 +1,204 @@
+_container =& DIContainerFactory::getContainer();
+ $this->_db =& $this->_container->getComponent("DbObject");
+ $this->_session =& $this->_container->getComponent("Session");
+ $this->_authoritiesView =& $this->_container->getComponent("authoritiesView");
+ $this->_configView =& $this->_container->getComponent("configView");
+ }
+ /**
+ * ルーム内参加可能者一覧、およびそれらの人物へ与えているロール権限、そして権限設定可能上限
+ *
+ * @access public
+ */
+ function &getRoomUsersList($page, $parent_page, $authorities)
+ {
+ $subroom_flag = false;
+ $edit_current_page_id = $page['page_id'];
+ $parent_page_id = $parent_page['page_id'];
+ if($edit_current_page_id != _SELF_TOPPUBLIC_ID && $parent_page['thread_num']==1) {
+ $subroom_flag = true;
+ }
+ $space_type = $page['space_type'];
+ // 親ページがない＝パブリックスペースTOP
+ // このときはcreateroom_flag設定による権限以上の権限取得の抜け駆け禁止
+ if($space_type == _SPACE_TYPE_PUBLIC && $page['thread_num'] == 0) {
+ $public_top_page_flag = _ON;
+ }
+ else {
+ $public_top_page_flag = _OFF;
+ }
+
+ $default_entry_flag = $page['default_entry_flag'];
+
+ $config = $this->_configView->getConfigByCatid(_SYS_CONF_MODID, _GENERAL_CONF_CATID);
+ if($config == false) {
+ return false;
+ }
+ $default_entry_role_auth_public = $config['default_entry_role_auth_public']['conf_value'];
+ $default_entry_role_auth_group = $config['default_entry_role_auth_group']['conf_value'];
+
+
+ $params = array();
+ $select_str = 'SELECT {users}.user_id, {users}.handle, '.
+ '{authorities}.user_authority_id,'.
+ '{authorities}.role_authority_id,'.
+ '{authorities}.public_createroom_flag,'.
+ '{authorities}.group_createroom_flag,'.
+ '{authorities}.hierarchy,'.
+ '{pages_users_link}.role_authority_id AS authority_id,'.
+ '{pages_users_link}.createroom_flag';
+
+ $from_str = ' FROM {authorities}, {users}'.
+ ' LEFT JOIN {pages_users_link} ON {pages_users_link}.room_id='.$edit_current_page_id.
+ ' AND {users}.user_id={pages_users_link}.user_id ';
+
+ $where_str = ' WHERE {users}.role_authority_id={authorities}.role_authority_id';
+
+ if($parent_page['thread_num'] >= 1) {
+ //親ルームに参加している会員すべて（サブグループ作成）
+ if($parent_page['default_entry_flag']) {
+ $where_str .= ' AND {users}.user_id NOT IN (SELECT user_id FROM {pages_users_link} WHERE room_id =' . $parent_page_id . ' AND role_authority_id = ' . _ROLE_AUTH_OTHER . ')';
+ }
+ else {
+ $where_str .= ' AND {users}.user_id IN (SELECT user_id FROM {pages_users_link} WHERE room_id =' . $parent_page_id . ')';
+ }
+ }
+ $sql = $select_str . $from_str . $where_str;
+ $users =& $this->_db->execute($sql, $params, null, null, true,
+ array($this, '_usersFetchCallback'),
+ array($subroom_flag, $space_type, $default_entry_flag, $default_entry_role_auth_public, $default_entry_role_auth_group, $authorities, $public_top_page_flag));
+ return $users;
+ }
+ /**
+ * fetch時コールバックメソッド
+ * @param result adodb object
+ * @return array items
+ * @access private
+ */
+ function &_roomusersFetchcallback($result)
+ {
+ $ret = array();
+ while ($row = $result->fetchRow()) {
+ $ret[$row['user_id']] = $row;
+ }
+ return $ret;
+ }
+ /**
+ * fetch時コールバックメソッド
+ * @param result adodb object
+ * @return array items
+ * @access private
+ */
+ function &_usersFetchcallback($result, $params)
+ {
+ $subroom_flag = $params[0];
+ $space_type = $params[1];
+ $default_entry_flag = $params[2];
+ $default_entry_role_auth_public = $params[3];
+ $default_entry_role_auth_group = $params[4];
+ $authorities = $params[5];
+ $public_top_page_flag = $params[6];
+
+ $auth = array();
+ foreach($authorities as $a) {
+ $auth[$a['role_authority_id']] = $a;
+ }
+
+ $ret = array();
+
+ while ($row = $result->fetchRow()) {
+ // createroom_flag がONでも、該当のページがパブリックスペースのTOPのときは有効にならない！
+ if(($public_top_page_flag==_OFF && $row['createroom_flag']==_ON) || ($public_top_page_flag==_OFF && $space_type==_SPACE_TYPE_PUBLIC && $row['public_createroom_flag']==_ON) || ($space_type==_SPACE_TYPE_GROUP && $row['group_createroom_flag']==_ON)) {
+ $createroom_flag =_ON;
+ }
+ else {
+ $createroom_flag =_OFF;
+ }
+ // authがNULLのとき デフォルト権限を意味する
+ if(is_null($row['authority_id'])) {
+ if($default_entry_flag==_OFF) {
+ $row['authority_id'] = _ROLE_AUTH_OTHER;
+ }
+ else {
+ if($space_type==_SPACE_TYPE_PUBLIC) {
+ $row['authority_id'] = $default_entry_role_auth_public;
+ }
+ else {
+ $row['authority_id'] = $default_entry_role_auth_group;
+ }
+ }
+ }
+
+ $row_auth = array();
+ foreach($auth as $auth_id=>$a) {
+
+ $row_auth[$auth_id] = false;
+
+ if($subroom_flag == true) { // サブルームであれば誰でも何にでもなれる
+ $row_auth[$auth_id] = true;
+ }
+ else {
+ if($auth_id==_ROLE_AUTH_CHIEF) {
+ if($row['hierarchy'] >=_HIERARCHY_CHIEF || ($row['authority_id'] == _ROLE_AUTH_ADMIN || $row['authority_id'] == _ROLE_AUTH_CHIEF) || $createroom_flag==_ON) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ else if($auth_id==_ROLE_AUTH_GENERAL) {
+ if($row['hierarchy'] >=_HIERARCHY_GENERAL || ($row['authority_id'] == _ROLE_AUTH_GENERAL) || $createroom_flag==_ON) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ else if($auth_id==_ROLE_AUTH_GUEST) { // ゲストは誰でもなれる
+ $row_auth[$auth_id] = true;
+ }
+ else {
+ if($row['hierarchy']>=$a['hierarchy'] || $createroom_flag == _ON || $row['authority_id'] == $a['role_authority_id']) {
+ $row_auth[$auth_id] = true;
+ }
+ }
+ }
+ }
+ $row['permitted_auth'] = $row_auth;
+ $ret[$row['handle']] = $row;
+ }
+ return $ret;
+ }
+}
diff --git a/html/webapp/modules/room/config/main.ini b/html/webapp/modules/room/config/main.ini
index d90e3c0..3367d25 100644
--- a/html/webapp/modules/room/config/main.ini
+++ b/html/webapp/modules/room/config/main.ini
@@ -6,4 +6,11 @@ room_list_visible_rows = 18 ;//ルーム一覧表示行数
room_users_regist_once = 30000 ;//一度に登録する会員数（この数を越える会員の登録を行う場合、sendを複数回繰り返す）
[Room_View_Admin_Regist_Selectusers:Room_View_Admin_Regist_Confirm]
-room_users_list = 15 ;//会員選択一覧表示行数
\ No newline at end of file
+room_users_list = 15 ;//会員選択一覧表示行数
+
+[Room_View_Admin_Import]
+define:ROOM_IMPORT_LINE_LIMIT = 10000
+
+[Room_View_Admin_Import_Upload]
+define:ROOM_TIME_LIMIT = 12000
+define:ROOM_IMPORT_ITEM_COLUMN = 2
\ No newline at end of file
diff --git a/html/webapp/modules/room/files/css/default/style.css b/html/webapp/modules/room/files/css/default/style.css
index ca6d442..f4e3017 100644
--- a/html/webapp/modules/room/files/css/default/style.css
+++ b/html/webapp/modules/room/files/css/default/style.css
@@ -28,7 +28,7 @@ div.room_init_icon_title {
width:120px;
}
.room_admin{
- width:340px;
+ width:460px;
}
img.room_prefix_icon {
height:15px;
@@ -112,6 +112,11 @@ img.room_prefix_icon {
margin:5px;
padding:0.4em;
}
+div.room_csv_export {
+ float:right;
+ margin:-1.5em 20px 0.5em 0;
+ font-weight:bold;
+}
/* 登録内容確認 */
.room_confirm_default_entry {
font-weight:bold;
@@ -130,4 +135,51 @@ select.room_selectlist {
}
.room_inf td {
padding:6px;
+}
+/* 参加者インポート */
+.room_import_file_select {
+ width:32em;
+}
+.room_import_help_field {
+ width:42em;
+}
+div.room_import_help_description {
+ overflow: auto;
+ border: 1px solid;
+ padding: 5px;
+}
+table.room_import_help_description {
+ width:100%;
+}
+tr.room_grid_row {
+ margin : 1px;
+ border:1px solid #d5d5d5;
+ height : 22px;
+ overflow : hidden;
+ line-height: 18px;
+}
+th.room_grid_header {
+ padding : 3px 2px 2px 3px;
+ text-align:center;
+ background-color:#e0e0e0;
+ border:1px solid #d5d5d5;
+}
+td.room_grid_col {
+ padding : 3px 2px 2px 3px;
+ border:1px solid #d5d5d5;
+ padding-left:4px;
+}
+.room_indent {
+ margin-left:20px;
+}
+.room_import_form label {
+ margin:2px 8px;
+}
+.room_import_result {
+ margin: 5px 15px;
+ padding: 1em;
+ border: 1px solid #999;
+}
+.room_import_result table td {
+ padding: 2px 5px;
}
\ No newline at end of file
diff --git a/html/webapp/modules/room/files/js/room.js b/html/webapp/modules/room/files/js/room.js
index 3be6a2f..3ed2c72 100644
--- a/html/webapp/modules/room/files/js/room.js
+++ b/html/webapp/modules/room/files/js/room.js
@@ -241,5 +241,90 @@ clsRoom.prototype = {
'lang':select_lang
}
commonCls.sendView(this.id, params);
+ },
+ roomUsersExport: function(event, parent_page_id, edit_current_page_id, confirm_mes) {
+
+ var top_el = $(this.id);
+
+ var params = {
+ 'action':'room_action_admin_export',
+ 'parent_page_id':parent_page_id,
+ 'edit_current_page_id':edit_current_page_id
+ }
+ var parameter = new Object();
+ parameter["callbackfunc"] = function(res){
+ if(!commonCls.confirm(confirm_mes))
+ {
+ return false;
+ }
+ location.href= '.' + _nc_index_file_name + '?action=room_view_admin_export&_token='+ $('_token' +this.top_el_id).value;
+ }
+ parameter["callbackfunc_error"] = function(res) {
+ commonCls.alert(res);
+ }
+ commonCls.sendPost(this.id, params, parameter);
+ },
+ _isSelectFile: function(frm) {
+ if($F("room_import_file_select").length > 0) {
+ return(true);
+ }
+ return(false);
+ },
+ _alertImport: function(confirm_message, target) {
+ var keyword = $(target).textContent;
+ var newmsg = confirm_message.replace('%error_item%', keyword);
+ commonCls.alert(newmsg);
+ return;
+ },
+ doUserImport: function(frm, confirm_message) {
+ var keyword;
+ if(!this._isSelectFile(frm)) {
+ this._alertImport(confirm_message, 'room_import_label_file');
+ return false;
+ }
+
+ var this_el = $("room_import_frm");
+ var top_el = $(this.id);
+ var params = new Object();
+ params["method"] = "post";
+
+ params["top_el"] = top_el;
+ params["loading_el"] = top_el;
+ params["timeout_flag"] = 0;
+
+ params['form_prefix'] = "room_import_attachment";
+
+
+
+ params["param"] = new Object();
+ params["param"]["action"] = "room_view_admin_import_upload";
+
+ params["callbackfunc"] = function(res) {
+ this.user_checkdata(this_el);
+ }.bind(this);
+ params["callbackfunc_error"] = function(file_list, res){
+ commonCls.alert(res);
+ }.bind(this);
+ commonCls.sendAttachment(params);
+ },
+ user_checkdata: function(this_el) {
+ var top_el = $(this.id);
+ var chk_params = new Object();
+ chk_params["param"] = {"action":"room_view_admin_import_confirm"};
+ chk_params["top_el"] = top_el;
+ chk_params["loading_el"] = top_el;
+ chk_params["target_el"] = $(this.id);
+
+ commonCls.send(chk_params);
+ },
+ user_importdata: function() {
+ var top_el = $(this.id);
+ var action_params = new Object();
+ action_params['method'] = "post";
+ action_params["param"] = {"action":"room_action_admin_import_confirm"};
+ action_params["top_el"] = top_el;
+ action_params["loading_el"] = top_el;
+ action_params["target_el"] = $(this.id);
+ commonCls.send(action_params);
}
}
\ No newline at end of file
diff --git a/html/webapp/modules/room/language/chinese/main.ini b/html/webapp/modules/room/language/chinese/main.ini
index 5eac669..9742150 100644
--- a/html/webapp/modules/room/language/chinese/main.ini
+++ b/html/webapp/modules/room/language/chinese/main.ini
@@ -16,6 +16,7 @@ room_admin = "管理"
room_back_list = "返回"
room_admin_inf = "编辑"
room_admin_edit = "成员"
+room_admin_import = "进口"
room_confirm_roomdelete = "如果删除房间%s，房间内的所有模块都将消失。
+
+
+ <{$lang.room_import_confirm_message1|smarty:nodefaults|sprintf:$action.page.page_name}>
+
+
+ <{foreach item=num key=auth_name from=$action.added_auth_member_num}>
+ <{if $num!=0}>
+ <{$lang.room_import_confirm_change_count|sprintf:$num:$auth_name}>
+ <{$lang.room_import_confirm_change_count|sprintf:$action.deleted_auth_member_num:$lang.room_not_entry}>
+ <{/if}>
+
+
+
+ <{$lang.room_import_confirm_message2|smarty:nodefaults}>
+
+
+
+ <{foreach item=num key=auth_name from=$action.total_auth_member_num}>
+ <{if $num!=0}>
+
+ <{$auth_name}>
+ <{$num}>
+
+ <{/if}>
+ <{/foreach}>
+
+
+
+ <{if count($action.warnMsg)>0 && $action.warnMsg.0!=''}>
+
+ <{$lang.room_import_confirm_warnMsg|smarty:nodefaults}>
+
+ <{/if}>
+
+
+ <{* 閉じる *}>
+
+
+
+
+
+
+
+
+<{include file="room_script.html"}>
+<{/strip}>
diff --git a/html/webapp/modules/room/templates/default/room_view_admin_import_confirm.html b/html/webapp/modules/room/templates/default/room_view_admin_import_confirm.html
new file mode 100644
index 0000000..5268080
--- /dev/null
+++ b/html/webapp/modules/room/templates/default/room_view_admin_import_confirm.html
@@ -0,0 +1,68 @@
+<{strip}>
+
+<{include file="room_script.html"}>
+
+<{/strip}>
\ No newline at end of file
diff --git a/html/webapp/modules/room/templates/default/room_view_admin_regist_selectusers.html b/html/webapp/modules/room/templates/default/room_view_admin_regist_selectusers.html
index 8c25c5f..4d7f761 100644
--- a/html/webapp/modules/room/templates/default/room_view_admin_regist_selectusers.html
+++ b/html/webapp/modules/room/templates/default/room_view_admin_regist_selectusers.html
@@ -21,6 +21,14 @@
+
+ <{* CSVエクスポート *}>
+
+
<{assign var="edit_current_page_id" value=$action.edit_current_page_id}>