ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 2832


Ignore:
Timestamp:
May 12, 2007, 4:11:12 PM (13 years ago)
Author:
ebihara
Message:

#707:r2284:2461のマージ後、携帯でスケジュール関連機能が動作していない箇所があったのを修正

Location:
OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/do/fh_biz_schedule_edit.php

    r2816 r2832  
    1616        }
    1717        $schedule = biz_getScheduleInfo($requests['schedule_id']);
    18         echo 1;
    19         print_r($schedule);
    20         exit;
    21        
     18        $requests['sc_b_year'] = $requests['sc_b_year'] + 2000;
     19
    2220        //ERROR----------------
    2321        //存在しない日付
     
    131129        $finish_date = $begin_date;  //当日中に終わる予定は、開始日と終了日は同一でなければならない
    132130
    133 
    134         $finish_date = date("Y-m-d", strtotime($requests['sc_b_year'].'-'.$requests['sc_b_month'].'-'.($requests['sc_b_date']+($requests['sc_bn']-1))));
    135 
    136131        $schedule_id = '';
    137132
    138         biz_editSchedule($requests['sc_title'], $schedule['c_member_id'], $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['sc_j_mem'], $requests['public_flag'], $requests['schedule_id']);
     133        $biz_schedule_member = biz_getJoinIdSchedule($requests['schedule_id']);
     134
     135        biz_editSchedule($requests['sc_title'], $schedule['c_member_id'], $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['sc_j_mem'], $requests['public_flag'], $requests['schedule_id'], $biz_schedule_member);
    139136        $schedule_id = $requests['schedule_id'];
    140137
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/do/fhg_biz_schedule_add.php

    r2816 r2832  
    144144        if (!$requests['sc_rp']) {
    145145            //繰り返しをしない予定登録
    146             biz_insertSchedule($requests['sc_title'], $requests['target_id'], $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['biz_group_id'], $requests['public_flag'], $biz_schedule_member);
     146            biz_insertSchedule($requests['sc_title'], $u, $begin_date, $finish_date, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, 0, $requests['biz_group_id'], $requests['public_flag'], $biz_schedule_member);
    147147        } else {
    148148            //繰り返し予定
     
    153153                $tmp = date("Ymd", $nowday);
    154154                if ($rp_rule & (1 << date("w",$nowday))) {
    155                     biz_insertSchedule($requests['sc_title'], $requests['target_id'], $tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['biz_group_id'], $requests['public_flag'], $biz_schedule_member);
     155                    biz_insertSchedule($requests['sc_title'], $u, $tmp, $tmp, $begin_time, $finish_time, $requests['sc_memo'], $rp_rule, $first_id, $requests['biz_group_id'], $requests['public_flag'], $biz_schedule_member);
    156156                }
    157157            }
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/page/fh_biz_schedule_edit.php

    r1856 r2832  
    2727
    2828        //日付・時刻を出す
    29         $begin_year = date("y", strtotime($requests['begin_date']));
    30         $begin_month = date("m", strtotime($requests['begin_date']));
    31         $begin_day = date("j", strtotime($requests['begin_date']));
     29        if (!is_null($requests['begin_date'])) {
     30            $begin_year = date("y", strtotime($requests['begin_date']));
     31            $begin_month = date("m", strtotime($requests['begin_date']));
     32            $begin_day = date("d", strtotime($requests['begin_date']));
     33        }
    3234
    33         $begin_hour = date("G", strtotime($requests['begin_time']));
    34         $begin_min = date("i", strtotime($requests['begin_time']));
    35         $finish_hour = date("G", strtotime($requests['finish_time']));
    36         $finish_min = date("i", strtotime($requests['finish_time']));
     35        if (!is_null($requests['begin_time'])) {
     36            $begin_hour = date("H", strtotime($requests['begin_time']));
     37            $begin_min = date("i", strtotime($requests['begin_time']));
     38        }
     39
     40        if (!is_null($requests['finish_time'])) {
     41            $finish_hour = date("H", strtotime($requests['finish_time']));
     42            $finish_min = date("i", strtotime($requests['finish_time']));
     43        }
    3744
    3845        $j_members = unserialize($requests['members']);
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_add.tpl

    r2816 r2832  
    3131               
    3232                </select><br>
    33 ({*
    34 グループ:<select name="biz_group_id">
    35         <option value="0">指定なし
    36 ({foreach from=$biz_group_list item=biz_group})
    37         <option value="({$biz_group.biz_group_id})"({if $form_val.biz_group_id == $biz_group.biz_group_id}) selected({/if})>({$biz_group.name})
    38 ({/foreach})
    39 </select><br>
    4033公開範囲:<br>
    4134<input type='radio' name='public_flag' value='public' checked>全体に公開<br>
    42 <input type='radio' name='public_flag' value='group'>グループまで公開<br>
    43 <input type='radio' name='public_flag' value='private'>公開しない<br><br>
     35<input type='radio' name='public_flag' value='private'>参加者のみに公開<br><br>
    4436<center>
    45 *})
    46 
    4737
    4838<input type="hidden" name="target_id" value="({$t_id})">
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_edit.tpl

    r2816 r2832  
    3131<input type="hidden" name="biz_group_id" value="0">
    3232<input type="hidden" name="public_flag" value="public">
    33 ({*
     33
    3434公開範囲:<br>
    3535<input type='radio' name='public_flag' value='public' ({if $public_flag == 'public'})checked({/if})>全体に公開<br>
    36 <input type='radio' name='public_flag' value='group' ({if $public_flag == 'group'})checked({/if})>グループまで公開<br>
    37 <input type='radio' name='public_flag' value='private' ({if $public_flag == 'private'})checked({/if})>公開しない<br>
     36<input type='radio' name='public_flag' value='private' ({if $public_flag == 'private'})checked({/if})>参加者のみに公開<br>
    3837<br>
    39 *})
     38
    4039参加者:
    4140        ({foreach item=name key=id from=$member})
  • OpenPNE/branches/ebihara/prj_dev28x/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_view.tpl

    r1801 r2832  
    2424登録者:<a href="({t_url m=ktai a=page_f_home})&amp;target_c_member_id=({$schedule.c_member_id})&amp;({$tail})">({$schedule.writer_name})</a><br>
    2525公開範囲:
    26 ({if $schedule.public_flag == "public"})
    27 全員に公開
    28 ({elseif $schedule.public_flag == "group"})
    29 グループまで公開
    30 ({elseif $schedule.public_flag == "private"})
    31 公開しない
     26({if $schedule.public_flag == "private"})
     27参加者のみに公開
     28({else})
     29全体に公開
    3230({/if})<br>
    3331参加者:
Note: See TracChangeset for help on using the changeset viewer.