Changeset 20537

Timestamp:

10/03/08 01:54:41 (3 months ago)

Author:

yandod

Message:

スキーマ変更シェル・懇親会の参加・懇親会の追加参加・キャンセル を実装。リファクタリングは後で。

Location:

websites/events.php.gr.jp/trunk/app

Files:

• controllers/event_attendees_controller.php (modified) (1 diff)
• controllers/events_controller.php (modified) (4 diffs)
• vendors/shells/convert.php (added)
• views/event/show.ctp (modified) (5 diffs)

websites/events.php.gr.jp/trunk/app/controllers/event_attendees_controller.php

@@ -71 +71 @@
     }
 
+    function party($id)
+    {
+        $event_attendee = $this->EventAttendee->findById($id);
+        if (!$event_attendee) {
+            $this->redirect('/');
+        }
+
+        if ($this->Session->read('role') == 'admin' || $this->Session->read('id') == $event_attendee['EventAttendee']['user_id']) {
+            $event_attendee['EventAttendee']['party'] = 1;
+            $this->EventAttendee->save($event_attendee);
+        }
+
+        $this->redirect('/events/show/' . $event_attendee['EventAttendee']['event_id']);
+    }
+    
+    function party_cancel($id)
+    {
+        $event_attendee = $this->EventAttendee->findById($id);
+        if (!$event_attendee) {
+            $this->redirect('/');
+        }
+
+        if ($this->Session->read('role') == 'admin' || $this->Session->read('id') == $event_attendee['EventAttendee']['user_id']) {
+            $event_attendee['EventAttendee']['party'] = 0;
+            $this->EventAttendee->save($event_attendee);
+        }
+
+        $this->redirect('/events/show/' . $event_attendee['EventAttendee']['event_id']);
+    }
 }
 ?>

websites/events.php.gr.jp/trunk/app/controllers/events_controller.php

@@ -16 +16 @@
     var $name = 'Event';
     var $helpers = array('Rss', 'Datespan', 'Javascript');
-    var $uses = array('Event', 'Trackback');
+    var $uses = array('Event', 'Trackback','User');
 
     /**
@@ -79 +79 @@
 
         $this->Event->EventComment->bindModel(array('belongsTo' => $has_one2));
-        $this->Event->EventAttendee->bindModel(array('belongsTo' => $has_one2));
-
+        //$this->Event->EventAttendee->bindModel(array('belongsTo' => $has_one2))
+        
         $re = $this->Event->findById($id, null, null, 2);
         if (!$re) {
@@ -88 +88 @@
 
         $attendee_count = 0;
+        $party_count = 0;
         $joined = false;
         $canceled = false;
+        $user_id_list = array();
         foreach ($re['EventAttendee'] as $row) {
+                $user_id_list[] = $row['user_id'];
             // 自分が参加していたらフラグをたてる
-            if ($this->Session->read('id') == $row['User']['id']) {
+            if ($this->Session->read('id') == $row['user_id']) {
                 $joined = true;
                 if ($row['canceled'] == 1) {
@@ -102 +105 @@
                 $attendee_count++;
             }
-        }
-
+            if ($row['canceled'] != 1 && $row['party'] == 1) {
+                $party_count++;
+            }            
+        }
+
+        $cond = array(
+                'id' => $user_id_list
+        );
+        $user = Set::combine($this->User->find('all',array('conditions' =>$cond)),'{n}.User.id','{n}.User.nickname');
+
+        $this->set('user',$user);
         $this->set('joined', $joined);
         $this->set('canceled', $canceled);
         $this->set('attendee_count', $attendee_count);
+        $this->set('party_count', $party_count);
         $this->set('attendee_nokori', $re['Event']['max_register'] - $attendee_count);
         $this->set('is_over', $this->Event->isOver($id));

websites/events.php.gr.jp/trunk/app/views/event/show.ctp

@@ -44 +44 @@
 <li>募集人数:<?php echo $data['Event']['max_register']; ?></li>
 <li>現在の参加人数:<?php echo $attendee_count; ?></li>
+<li>懇親会参加人数:<?php echo $party_count; ?></li>
 <li>残り:<?php echo $attendee_nokori; ?></li>
 </ul>
@@ -49 +50 @@
 <div align="center">
 <table>
-  <tr><th>name</th><th>comment</th><th>timestamp</th><th>action</th></tr>
+  <tr><th>name</th><th>comment</th><th>party</th><th>timestamp</th><th>action</th></tr>
   <?php foreach ($data['EventAttendee'] as $key => $item): ?>
 
@@ -61 +62 @@
     <?php endif; ?>
   <?php endif; ?>
-    <td><?php echo $item['User']['nickname']; ?></td>
+    <td><?php echo $user[$item['user_id']]; ?></td>
     <td><?php echo h($item['comment']); ?></td>
+    <td style="text-align:center"><?php if ($item['party']) echo '○'; ?></td>
     <td><?php echo $item['created']; ?></td>
-    <td>
+    <td style="text-align:center">
     <?php /* 自分のでまだキャンセルしてなかったらキャンセルリンクを出す */ ?>
-    <?php if ($item['User']['id'] == $session->read('id') && ($item['canceled'] != 1)): ?>
-      <?php echo $html->link('cancel', '/event_attendees/cancel/'.$item['id'], null, 'ドタキャン対策の為、キャンセルするとそのイベントには二度と参加できません。キャンセルしますか？'); ?>
+    <?php if ($item['user_id'] == $session->read('id') && ($item['canceled'] != 1)): ?>
+      <?php echo $html->link('キャンセル', '/event_attendees/cancel/'.$item['id'], null, 'ドタキャン対策の為、キャンセルするとそのイベントには二度と参加できません。キャンセルしますか？'); ?>
     <?php endif; ?>
     <?php if (($session->read('role') == 'admin') && ($item['canceled'] == 1)): ?>
       &nbsp;<?php echo $html->link('キャンセル解除', '/event_attendees/cancelrevert/'.$item['id']); ?>
+    <?php endif; ?>
+    <?php if ($item['user_id'] == $session->read('id')): ?>
+    <?php if (($item['canceled'] != 1) && ($item['party'] == "0")): ?>
+      <?php echo $html->link('懇親会に追加参加', '/event_attendees/party/'.$item['id'], null); ?>
+    <?php else: ?>
+      <?php echo $html->link('懇親会のみ辞退', '/event_attendees/party_cancel/'.$item['id'], null); ?>    
+    <?php endif; ?>
     <?php endif; ?>
     </td>
@@ -76 +85 @@
   <?php endforeach; ?>
   <tr>
-    <td colspan="4">
+    <td colspan="5">
     <?php if ($session->check('id')): ?>
       <p><strong>イベントに参加する</strong></p>
@@ -102 +111 @@
         <?php echo $form->hidden('EventAttendee.event_id', array('value' => $event_id)); ?>
         <?php echo $form->input('EventAttendee.comment', array('type' => 'text', 'size' => '45')); ?>
+        <?php echo $form->checkbox('EventAttendee.party', array('value' => '1')); ?>懇親会に参加する        
         <?php echo $form->end('参加する'); ?>
       <?php endif; ?>