Changeset 79

Timestamp:

07/06/07 15:47:52 (1 year ago)

Author:

digitalspaghetti

Message:

More improvments to the event system with maps

Files:

• branch/controllers/events_controller.php (modified) (9 diffs)
• branch/controllers/venues_controller.php (modified) (5 diffs)
• branch/db.sql (modified) (18 diffs)
• branch/models/event.php (modified) (2 diffs)
• branch/models/venue.php (modified) (1 diff)
• branch/tests/cases/controllers/events_controller.test.php (modified) (1 diff)
• branch/tests/cases/models/event.test.php (modified) (1 diff)
• branch/views/events/add.ctp (modified) (1 diff)
• branch/views/events/admin_add.ctp (modified) (1 diff)
• branch/views/events/admin_edit.ctp (modified) (1 diff)
• branch/views/events/admin_index.ctp (modified) (1 diff)
• branch/views/events/admin_view.ctp (modified) (1 diff)
• branch/views/events/edit.ctp (modified) (1 diff)
• branch/views/events/index.ctp (modified) (1 diff)
• branch/views/events/view.ctp (modified) (1 diff)
• branch/views/helpers/google_map.php (modified) (1 diff)
• branch/views/layouts/default.ctp (modified) (1 diff)
• branch/views/venues/admin_add.ctp (moved) (moved from branch/views/venues/add.ctp) (1 diff)
• branch/views/venues/admin_edit.ctp (moved) (moved from branch/views/venues/edit.ctp) (1 diff)
• branch/views/venues/admin_index.ctp (moved) (moved from branch/views/venues/index.ctp)
• branch/views/venues/admin_view.ctp (moved) (moved from branch/views/venues/view.ctp) (1 diff)
• branch/webroot/css/default.css (modified) (1 diff)

branch/controllers/events_controller.php

@@ -3 +3 @@
-
-        var $name = 'Events';
-uses = array('Event', 'Group'
+helpers = array('Html', 'Form', 'Ajax', 'GoogleMap' 
-
-        function index() {
@@ -11 +11 @@
-
-        function view($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid Event.');
-                        $this->redirect(array('action'=>'index'), null, true);
@@ -19 +19 @@
-
-        function add() {
-
+ 
-                        $this->cleanUpFields();
-                        $this->Event->create();
-
+ 
-                                $this->Session->setFlash('The Event has been saved');
-                                $this->redirect(array('action'=>'index'), null, true);
@@ -30 +30 @@
-                }
-                $tags = $this->Event->Tag->generateList();
-countries = $this->Event->Country
+venues = $this->Event->Venue
-                $eventTypes = $this->Event->EventType->generateList();
-                $users = $this->Event->User->generateList();
-                $subjects = $this->Event->Subject->generateList();
-countri
+venu
-        }
-
-        function edit($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid Event');
-                        $this->redirect(array('action'=>'index'), null, true);
-                }
-
+ 
-                        $this->cleanUpFields();
-
+ 
-                                $this->Session->setFlash('The Event saved');
-                                $this->redirect(array('action'=>'index'), null, true);
@@ -51 +51 @@
-                        }
-                }
-
+ 
-                        $this->data = $this->Event->read(null, $id);
-                }
-                $tags = $this->Event->Tag->generateList();
-countries = $this->Event->Country
+venues = $this->Event->Venue
-                $eventTypes = $this->Event->EventType->generateList();
-                $users = $this->Event->User->generateList();
-                $subjects = $this->Event->Subject->generateList();
-countri
+venu
-        }
-
-        function delete($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid id for Event');
-                        $this->redirect(array('action'=>'index'), null, true);
-                }
-
+ 
-                        $this->Session->setFlash('Event #'.$id.' deleted');
-                        $this->redirect(array('action'=>'index'), null, true);
@@ -80 +80 @@
-
-        function admin_view($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid Event.');
-                        $this->redirect(array('action'=>'index'), null, true);
@@ -88 +88 @@
-
-        function admin_add() {
-
-
+
-                        $this->cleanUpFields();
-                        $this->Event->create();
-
+ 
-                                $this->Session->setFlash('The Event has been saved');
-                                $this->redirect(array('action'=>'index'), null, true);
@@ -100 +99 @@
-                }
-                $tags = $this->Event->Tag->generateList();
-countries = $this->Event->Country
+venues = $this->Event->Venue
-                $eventTypes = $this->Event->EventType->generateList();
-                $users = $this->Event->User->generateList();
-                $subjects = $this->Event->Subject->generateList();
-countri
+venu
-        }
-
-        function admin_edit($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid Event');
-                        $this->redirect(array('action'=>'index'), null, true);
-                }
-
+ 
-                        $this->cleanUpFields();
-
+ 
-                                $this->Session->setFlash('The Event saved');
-                                $this->redirect(array('action'=>'index'), null, true);
@@ -121 +120 @@
-                        }
-                }
-
+ 
-                        $this->data = $this->Event->read(null, $id);
-                }
-                $tags = $this->Event->Tag->generateList();
-countries = $this->Event->Country
+venues = $this->Event->Venue
-                $eventTypes = $this->Event->EventType->generateList();
-                $users = $this->Event->User->generateList();
-                $subjects = $this->Event->Subject->generateList();
-countri
+venu
-        }
-
-        function admin_delete($id = null) {
-
+ 
-                        $this->Session->setFlash('Invalid id for Event');
-                        $this->redirect(array('action'=>'index'), null, true);
-                }
-
+ 
-                        $this->Session->setFlash('Event #'.$id.' deleted');
-                        $this->redirect(array('action'=>'index'), null, true);

branch/controllers/venues_controller.php

@@ -7 +7 @@
-
-        function admin_index() {
-                $this->layout = "map";
-                $this->Venue->recursive = 0;
-                $this->set('points', $this->Venue->findAll());
@@ -13 +12 @@
-
-        function admin_add() {
-                $this->layout = "map";
-                if(empty($this->data)) {
-                        $this->render();
@@ -36 +34 @@
-                        if($this->Venue->save($this->data)) {
-                                $this->Session->setFlash('The Venue has been saved');
-point
+venue
-                        } else {
-                                $this->Session->setFlash('Please correct errors below.');
@@ -62 +60 @@
-                        if($this->Venue->save($this->data)) {
-                                $this->Session->setFlash('The Venue has been saved');
-point
+venue
-                        } else {
-                                $this->Session->setFlash('Please correct errors below.');
@@ -77 +75 @@
-                if($this->Venue->del($id)) {
-                        $this->Session->setFlash('The Venue deleted: id '.$id.'');
-point
+venue
-                }
-        }

branch/db.sql

@@ -4 +4 @@
--- 
--- Host: localhost
-5, 2007 at 05:4
+6, 2007 at 03:2
--- Server version: 5.0.38
--- PHP Version: 5.2.1
@@ -431 +431 @@
-CREATE TABLE `events` (
-  `id` int(8) unsigned NOT NULL auto_increment,
-
-
-
-
-
+
-  `event_type_id` int(8) unsigned NOT NULL,
-  `event_date` date NOT NULL,
@@ -448 +444 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-DEFAULT CHARSET=utf8 AUTO_INCREMENT=1
+ DEFAULT CHARSET=utf8
-
--- 
--- Dumping data for table `events`
--- 
-
-
--- --------------------------------------------------------
@@ -472 +467 @@
--- 
-
-
--- --------------------------------------------------------
-
@@ -489 +483 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=1 
+
-
--- 
@@ -514 +508 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=1 
+
-
--- 
@@ -634 +628 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=2 
+
-
--- 
@@ -769 +763 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=1 
+
-
--- 
@@ -838 +832 @@
-  `comments` varchar(255) collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=1 
+
-
--- 
@@ -862 +856 @@
--- 
-
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `points`
--- 
-
-DROP TABLE IF EXISTS `points`;
-CREATE TABLE `points` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(60) NOT NULL,
-  `description` text NOT NULL,
-  `street` varchar(60) NOT NULL,
-  `city` varchar(60) NOT NULL,
-  `state` varchar(2) NOT NULL,
-  `zip` varchar(5) NOT NULL,
-  `latitude` float NOT NULL,
-  `longitude` float NOT NULL,
-  `zoom` int(11) NOT NULL,
-  `created` datetime NOT NULL,
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
-
--- 
--- Dumping data for table `points`
--- 
-
-INSERT INTO `points` (`id`, `name`, `description`, `street`, `city`, `state`, `zip`, `latitude`, `longitude`, `zoom`, `created`, `modified`) VALUES 
-(1, 'Tane''s Home', 'Tanes Home', '20/4 Dalgety Ave', 'Edinburgh', '', 'EH7 5', 55.9584, -3.16237, 3, '2007-07-05 17:10:14', '2007-07-05 17:10:14'),
-(4, '', '', '', '', '', '', 55.8683, -4.27112, 0, '2007-07-05 17:21:59', '2007-07-05 17:21:59'),
-(5, '', '', '', '', '', '', 34.0996, -118.412, 0, '2007-07-05 17:31:55', '2007-07-05 17:31:55');
-
--- --------------------------------------------------------
@@ -919 +881 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=2 
+
-
--- 
--- Dumping data for table `posts`
--- 
-
-INSERT INTO `posts` (`id`, `title`, `byline`, `body`, `post_date`, `comments_count`, `user_id`, `subject_id`, `access_level`, `stub`, `tags`, `frontpage`, `published`, `created`, `modified`) VALUES 
-(1, 'Welcome to the new No Half Measures website', 'New updated fancy do.', '<p><img alt="" title="" src="http://webrocket/img/NoHalfMeasures.jpg" align="left"/>Welcome to the new No Half Measures website.  This website has been updated to include lots of new features, such as:</p><ul><li>RSS feeds for all news and event content</li><li>Access to all our artists videos on youtube</li><li>You are able to comment on stories</li><li>Members-only access areas.<br /></li></ul>', '2007-06-21 14:56:00', NULL, 1, 1, 0, 'welcome_to_the_new_no_half_measures_website', 'No Half Measures, Youtube, Videos, Members Only', 1, 1, '2007-06-21 14:59:32', '2007-06-21 15:12:10');
-
--- --------------------------------------------------------
@@ -944 +903 @@
--- Dumping data for table `posts_tags`
--- 
-
-INSERT INTO `posts_tags` (`post_id`, `tag_id`) VALUES 
-(1, 5),
-(1, 6),
-(1, 7),
-(1, 8);
-
--- --------------------------------------------------------
@@ -968 +921 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=1 
+
-
--- 
@@ -1102 +1055 @@
-  `modified` datetime default NULL,
-  PRIMARY KEY  (`id`)
-2
+4
-
--- 
@@ -1109 +1062 @@
-
-INSERT INTO `subjects` (`id`, `title`, `posts_count`, `pages_count`, `events_count`, `feeds_count`, `images_count`, `galleries_count`, `videos_count`, `created`, `modified`) VALUES 
-
+
+
+
-
--- --------------------------------------------------------
@@ -1122 +1077 @@
-  `tag` varchar(255) collate utf8_unicode_ci NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=9 
+
-
--- 
--- Dumping data for table `tags`
--- 
-
-INSERT INTO `tags` (`id`, `tag`) VALUES 
-(4, 'Test 2'),
-(3, 'Test'),
-(5, 'No Half Measures'),
-(6, 'Youtube'),
-(7, 'Videos'),
-(8, 'Members Only');
-
--- --------------------------------------------------------
@@ -1280 +1227 @@
-
--- 
+-- Table structure for table `venues`
+-- 
+
+DROP TABLE IF EXISTS `venues`;
+CREATE TABLE `venues` (
+  `id` int(8) NOT NULL auto_increment,
+  `name` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `description` text collate utf8_unicode_ci NOT NULL,
+  `street` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `city` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `state` varchar(255) collate utf8_unicode_ci default NULL,
+  `postcode` varchar(255) collate utf8_unicode_ci NOT NULL,
+  `latitude` float NOT NULL,
+  `longitude` float NOT NULL,
+  `zoom` int(11) NOT NULL,
+  `created` datetime default NULL,
+  `modified` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ;
+
+-- 
+-- Dumping data for table `venues`
+-- 
+
+-- --------------------------------------------------------
+
+-- 
--- Table structure for table `videos`
--- 
@@ -1299 +1273 @@
-  `modified` datetime NOT NULL,
-  PRIMARY KEY  (`id`)
-AUTO_INCREMENT=8 
+
-
--- 
--- Dumping data for table `videos`
--- 
-
-INSERT INTO `videos` (`id`, `title`, `slug`, `body`, `published`, `playlist_id`, `pages`, `num_per_page`, `user_id`, `subject_id`, `tags`, `created`, `modified`) VALUES 
-(4, 'The Hedrons Playlist', 'the_hedrons_playlist', 'All of The hedrons videos', 1, '374A01AB56A74B24', 1, 20, 1, 1, 'The Hedrons, Videos, Singles, Album, Music', '2007-06-22 14:15:08', '2007-06-22 14:15:08'),
-(5, 'The Hedrons EPK Videos', 'the_hedrons_epk_videos', 'The Hedrons press & Documentry videos', 1, '1C0DBE8419B7009A', 1, 20, 1, 1, 'The Hedrons, EPK, Videos, Press', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
-(6, 'The Hedrons Music Videos', 'the_hedrons_music_videos', 'All of The Hedrons music videos', 1, 'DC8DA47DD3DF59EA', 1, 20, 1, 1, 'The Hedrons, Music, Videos', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
-(7, 'The Hedrons Live Videos', 'the_hedrons_live_videos', 'A collection of live performances by The Hedrons', 1, '447B38C4E627A018', 1, 20, 1, 1, 'The Hedrons, Live, Music', '0000-00-00 00:00:00', '0000-00-00 00:00:00');
-

branch/models/event.php

@@ -5 +5 @@
-        
-        var $actsAs = array('CounterCache','Tag');
-        
-        var $validate = array(
-                'venue' => VALID_NOT_EMPTY,
-                'city' => VALID_NOT_EMPTY,
-                'country_id' => VALID_NOT_EMPTY,
-                'postcode' => VALID_NOT_EMPTY,
-                'event_type_id' => VALID_NOT_EMPTY,
-                'event_date' => VALID_NOT_EMPTY,
-                'tags' => VALID_NOT_EMPTY,
-                'user_id' => VALID_NOT_EMPTY,
-                'subject_id' => VALID_NOT_EMPTY,
-                'published' => VALID_NOT_EMPTY,
-        );
-
-        //The Associations below have been created with all possible keys, those that are not needed can be removed
-        var $belongsTo = array(
-Country' => array('className' => 'Country
-country
+Venue' => array('className' => 'Venue
+venue
-                                                                'conditions' => '',
-                                                                'fields' => '',
@@ -57 +44 @@
-                                                'limit' => '',
-                                                'offset' => '',
-true
+''
-                                                'finderQuery' => '',
-                                                'deleteQuery' => '',
-                                                'insertQuery' => ''),
-        );
+        
+        function publish($id)
+    {
+        $this->id = $id;
+        $this->savefield('published', 1);
+    }
+    
+        function unpublish($id)
+    {
+        $this->id = $id;
+        $this->savefield('published', 0);
+    }
-
-}

branch/models/venue.php

@@ -3 +3 @@
-
-        var $name = 'Venue';
+        
+        var $actsAs = array('CounterCache','Tag');
-
-        //The Associations below have been created with all possible keys, those that are not needed can be removed

branch/tests/cases/controllers/events_controller.test.php

@@ -3 +3 @@
-loadController('Events');
-
-Unit
+Cake
-        var $TestObject = null;
-

branch/tests/cases/models/event.test.php

@@ -3 +3 @@
-loadModel('Event');
-
-Unit
+Cake
-        var $TestObject = null;
-

branch/views/events/add.ctp

@@ -1 +1 @@
-<div class="event">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-<div class="actions">
-        <ul>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        </ul>
-</div>

branch/views/events/admin_add.ctp

@@ -1 +1 @@
-<div class="event">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>

branch/views/events/admin_edit.ctp

@@ -1 +1 @@
-<div class="event">
-h2>Edit Event</h2
-?php echo $form->create('Event');?
-               <fieldset id="main-content"
-               <legend>Main Content</legend>
-       <?php echo $form->input('id');?>
-       <?php echo $form->input('venue', array('class' => 'required'));?>
-       <?php echo $form->input('address');?>
-       <?php echo $form->input('city', array('class' => 'required'));?>
-       <?php echo $form->input('country_id', array('class' => 'required', 'options' => $countries));?>
-       <?php echo $form->input('postcode', array('class' => 'required'));?>
-               <?php echo $form->input('event_type_id', array('class' => 'required', 'options' => $eventTypes));
-               <?php echo $form->input('event_date', array('class' => 'required'));?
-               <?php echo $form->input('event_time');?>
-               <?php echo $form->input('event_url');?
-               </fieldset
-       
-<fieldset id="meta-content">
-       <legend>Meta Data</legend>
-               <?php echo $form->input('body',array('class'=>'wymeditor'));
-               <?php echo $form->input('tags', array('class' => 'tags', 'type'=>'text'));?
-               <?php echo $form->input('subject_id', array('class' => 'required', 'options' => $subjects));?>
-       </
-
-<fieldset id="publishing-options"
-               <legend>Publishing Options</legend
-               <?php echo $form->input('published', array('class' => 'required'));?>
-       </
-
-<?php echo $form->submit('Add', array('class'=>'wymupdate'));
-       <?php echo $html->link('Delete', array('action'=>'delete', $html->tagValue('Event/id')), null, 'Are you sure you want to delete #' . $html->tagValue('Event/id')); ?
-       </form
+?php echo $form->create('Event');?
+fieldset
+               <legend><?php __('Event Details');?></legend
+<?php
+echo $form->input('id');
+echo $form->input('subject_id');
+echo $form->input('venue_id');
+echo $form->input('event_type_id');
+echo $form->input('event_url');
+echo $form->input('body');
+
+</fieldset
+
+<fieldset
+               <legend><?php __('Event Date &amp; Time');?></legend
+<?php 
+echo $form->input('event_date');
+echo $form->input('event_time');               
+
+</fieldset
+
+<
+
+       <?php echo $form->input('tags', array('type'=>'text'));?
+</fieldset
+
+<
+
+       <?php echo $form->input('published'); 
+</fieldset
+<?php echo $form->end('Submit');?
-</div>
+<div class="actions">
+        <ul>
+                <li><?php echo $html->link(__('Delete', true), array('action'=>'delete', $form->value('Event.id')), null, __('Are you sure you want to delete', true).' #' . $form->value('Event.id')); ?></li>
+        </ul>
+</div>

branch/views/events/admin_index.ctp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-