Changeset 779 for trunk/app

Timestamp:

09/24/08 15:20:15 (8 weeks ago)

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app

Files:

• config/sql/postgresql/vclassrooms.sql (modified) (1 diff)
• models/vclassroom.php (modified) (3 diffs)
• views/elements/google_calendar.ctp (added)
• views/layouts/basic.ctp (modified) (1 diff)
• views/vclassrooms/admin_add.ctp (modified) (1 diff)
• views/vclassrooms/admin_edit.ctp (modified) (1 diff)
• views/vclassrooms/chat.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (4 diffs)
• webroot/js/jsapi.js (added)

trunk/app/config/sql/postgresql/vclassrooms.sql

@@ -11 +11 @@
     "fdate" date NOT NULL DEFAULT now(), -- finish date
     "access" smallint NOT NULL DEFAULT 0, -- public / only with code
-    "chat" smallint NOT NULL DEFAULT 0 -- active / desactive chat
+    "chat" smallint NOT NULL DEFAULT 0, -- active / desactive chat
+    "gcalendar_id" varchar(70) 
 );
 

trunk/app/models/vclassroom.php

@@ -310 +310 @@
  /**
  * classElements 
- * Get class (group) active elements (Webquest, Test, Trasures, Forums, etc)
+ * Get class (vGroup) active elements (Webquest, Test, Scavenger, Forums, etc)
  * this method is used in show() method, vclassrooms_controller.php
  * @param  integer $vclassroom_id  description
@@ -321 +321 @@
   try{   
 
-   $this->unbindModel(array('hasAndBelongsToMany'=>array('Test', 'Webquest', 'Treasure')));
-  
+   $this->unbindModel(array('hasAndBelongsToMany'=>array('Test', 'Webquest', 'Treasure'), 
+                            'hasMany'            =>array('Participation', 'Report', 'Chat')
+                     ));
+ 
    $this->bindModel(array(
                           'belongsTo'           =>array('Ecourse'=>array('fields'=>'id, title')),
@@ -359 +361 @@
 
    $data = $this->find($conditions);
-
+   //die(debug($data));
    return $data;
   }

trunk/app/views/layouts/basic.ctp

@@ -10 +10 @@
           echo $javascript->link('prototype');
           echo $javascript->link('myfunctions');
+          // echo $javascript->link('jsapi');  // Google apihttp://www.google.com/jsapi
           echo $javascript->link('scriptaculous.js?load=effects');
      endif;
+     //google.load("gdata", "1"); // load Google Data client library
+     //   google.setOnLoadCallback(getMyFeed); // wait until the page finishes loading and then call your code
 ?>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 

trunk/app/views/vclassrooms/admin_add.ctp

@@ -19 +19 @@
  
  echo $html->para(null, '<br />');
+
+  echo $form->input('Vclassroom.gcalendar_id', array('size' => 50, 'maxlength' => 70));
 
  echo $form->input('Vclassroom.fdate',array('type'=>'date','label'=>__('Finishing date', true), 'dateFormat'=>'DMY'));

trunk/app/views/vclassrooms/admin_edit.ctp

@@ -17 +17 @@
 
  echo $form->input('Vclassroom.fdate',array('type'=>'date','label'=>__('Finishing date', true), 'dateFormat'=>'DMY'));
+
+ echo $form->input('Vclassroom.gcalendar_id', array('size' => 50, 'maxlength' => 70));
 
  echo $form->label('Vclassroom.status', __('Published', true));

trunk/app/views/vclassrooms/chat.ctp

@@ -11 +11 @@
  endforeach;
  echo  $ajax->divEnd('updater');
+ echo  $ajax->div('chatters').$ajax->divEnd('chatters');
+
  echo $html->div(null, $session->read('Auth.User.username') .' '. __('writes', true));
  echo $ajax->div('charging',array('style'=>'display:none')).$html->image('static/loading.gif', array('alt'=>'Loading')).$ajax->divEnd('charging');

trunk/app/views/vclassrooms/show.ctp

@@ -7 +7 @@
 if ( $belongs === true ):
   echo  $html->para(null, __('Welcome', true) . '!<b> '. $session->read('Auth.User.username') .'</b>');
-  echo  $html->para(null, '<b>'.__('Created', true). '</b>:' . $data['Vclassroom']['created']);
+  echo  $html->para(null, '<b>'.__('Start date', true). '</b>:' . $data['Vclassroom']['sdate']);
+  echo  $html->para(null, '<b>'.__('Finish date', true). '</b>:' . $data['Vclassroom']['fdate']);
   echo  $html->para(null, '<b>'.__('Subject', true).'</b>: ' . $data['Ecourse']['title']);
+
+  if ( strlen($data['Vclassroom']['gcalendar_id']) > 8):
+     echo $this->element('google_calendar', array('gcalendar_id'=>$data['Vclassroom']['gcalendar_id']));  
+  endif;
+
   echo  $html->para(null, '<b>'.__('Course description', true).'</b>'. $ajax->link($html->image('static/arrow_down.png',array('alt'=>__('Course description',true), 'title'=>__('Course description',true))),'/vclassrooms/description/'.$data['Vclassroom']['ecourse_id'], array('update' => 'qn','loading'=>"Element.show('loading3');",'complete'=>"Element.hide('loading3');Effect.Appear('qn')"), null,false));
 
@@ -100 +106 @@
 
      // empty ajax div
-
      echo $ajax->div('updater') . $ajax->divEnd('updater'); 
 endif;
@@ -111 +116 @@
      echo $html->image('static/loading.gif', array('alt'=>'Loading')); 
 echo $ajax->divEnd('charging');
+
+// get Google calendar for this vgroup
+//$feedUrl = (string) 'http://www.google.com/calendar/feeds/'.$blog['User']['email'].'/public/full';
+
 ?>
 
@@ -116 +125 @@
 //<![CDATA[
 
+var myService;
+// var feedUrl = '<?php echo $feedUrl; ?>';
+
+function setupMyService() {
+  myService = new google.gdata.calendar.CalendarService('exampleCo-exampleApp-1');
+}
+
+function getMyFeed() {
+  setupMyService();
+ 
+  myService.getEventsFeed(feedUrl, handleMyFeed, handleError);
+}
 function chkPart()
 {