Changeset 753 for trunk/app

Timestamp:

09/03/08 21:34:40 (3 months ago)

Author:

aarkerio

Message:

New layout

Location:

trunk/app

Files:

• config/sql/postgresql/chats.sql (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (5 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• models/chat.php (modified) (2 diffs)
• models/vclassroom.php (modified) (1 diff)
• views/vclassrooms/chat.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (1 diff)

trunk/app/config/sql/postgresql/chats.sql

@@ -1 +1 @@
 CREATE TABLE chats (  -- chats on vgroups
    id serial NOT NULL PRIMARY KEY,
-   user_id int NOT NULL REFERENCES users(id), -- teacher id in fact
+   student_id int NOT NULL REFERENCES users(id), -- student id in fact
+   teacher_id int NOT NULL REFERENCES users(id), -- student id in fact
    vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
+   message varchar(100) NOT NULL,
    "created" timestamp(0) with time zone DEFAULT now() NOT NULL
 );

trunk/app/controllers/vclassrooms_controller.php

@@ -43 +43 @@
  }
   
- public function savemessage() 
- {
-  if ($this->data['Chat']):
-    $this->Sanitize = new Sanitize;
-    $this->Sanitize->clear($this->data['Chat']);
-    $this->save($this->data);
-    $this->render('oldmessages', 'ajax');
-  endif; 
- }
  public function chat($user_id, $vclassroom_id) 
  {
@@ -76 +67 @@
 
    $conditions = array('Vclassroom.id'=>$vclassroom_id, 'Vclassroom.user_id'=>$user_id, 'Vclassroom.status'=>1);
-   $fields     = array('id', 'name', 'user_id');   
+   $fields     = array('id', 'name', 'user_id'); 
    $this->set('data', $this->Vclassroom->find($conditions, $fields));
+
+   $conditions = array('Chat.vclassroom_id'=>$vclassroom_id);
+   $fields = array('Chat.message', 'Chat.created', 'User.username');;
+   $order = 'Chat.id DESC';
+   $limit = 15;
+   $this->set('msgs', $this->Vclassroom->Chat->findAll($conditions, $fields, $order, $limit));
+ }
+  public function savemessage()
+ {
+   $this->layout = 'ajax';
+
+   if ( !empty($this->data['Chat'])):
+     $this->Sanitize = new Sanitize;   
+     $this->Sanitize->clean($this->data['Chat']); 
+      
+     $this->Vclassroom->Chat->save($this->data);
+
+     $conditions = array('Chat.vclassroom_id'=>$this->data['Chat']['vclassroom_id']);
+     $fields = array('Chat.message', 'Chat.created', 'User.username');;
+     $order = 'Chat.id DESC';
+     $limit = 15;
+     
+     $this->set('data', $this->Vclassroom->Chat->findAll($conditions, $fields, $order, $limit));
+     $this->render('messages', 'ajax');
+   endif;
  }
 
@@ -103 +119 @@
  public function show($user_id, $vclassroom_id) 
  {
-   $this->pageTitle = 'Virtual Group';
+   $this->pageTitle = __('Virtual Class', true);
    $this->layout    = $this->Edublog->layout($user_id);
    $this->Edublog->blog($user_id);
@@ -116 +132 @@
    $this->set('data', $this->Vclassroom->classElements($vclassroom_id));
  }
-
+ 
  public function participation()
  {
@@ -227 +243 @@
  public function admin_linktest()
  {
-   if (!empty($this->data["TestsVclassroom"])):
+   if (!empty($this->data['TestsVclassroom'])):
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["TestsVclassroom"]); 
-        
-        $this->Vclassroom->TestsVclassroom->create();
+        $this->Sanitize->clean($this->data['TestsVclassroom']); 
         
         unset($this->Vclassroom->TestsVclassroom->id);
 
-        if ( $this->Vclassroom->TestsVclassroom->save($this->data["TestsVclassroom"])):
-               $this->msgFlash('Test linked', '/admin/vclassrooms/tests/'.$this->data["TestsVclassroom"]["vclassroom_id"]);
+        if ( $this->Vclassroom->TestsVclassroom->save($this->data['TestsVclassroom'])):
+               $this->msgFlash(__('Test linked', true), '/admin/vclassrooms/tests/'.$this->data["TestsVclassroom"]["vclassroom_id"]);
     endif;
     endif;

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "Virtual Class"
+msgstr "Clase Virtual"
 
 msgid  "You already answered this Scavenger Hunt"

trunk/app/models/chat.php

@@ -13 +13 @@
                              'User' => array(
                                             'className'    => 'User',
-                                            'foreignKey'   => 'user_id'  # teacher id in facts
+                                            'foreignKey'   => 'student_id'
                                             ),
                              'Vclassroom' => array(
@@ -22 +22 @@
   
   public $validate = array(  
-               'user_id' => VALID_NOT_EMPTY,
-                           'vclassroom_id' => VALID_NOT_EMPTY
+               'student_id' => VALID_NOT_EMPTY,
+                           'vclassroom_id' => VALID_NOT_EMPTY,
+                           'message' => VALID_NOT_EMPTY,
                            );
 }

trunk/app/models/vclassroom.php

@@ -46 +46 @@
                  'limit'         => null,
                  'foreignKey'    => 'vclassroom_id'
+                 ),
+                      'Chat' =>
+               array('className'     => 'Chat',
+                 'conditions'    => null,
+                 'order'         => null,
+                 'limit'         => null,
+                 'foreignKey'    => 'vclassroom_id'
                  )
+
                );
               

trunk/app/views/vclassrooms/chat.ctp

@@ -1 +1 @@
 <?php
-//debug($data);
+// debug($data);
 
 if ( $belongs === true ):
-
- echo $ajax->div('updater') . $ajax->divEnd('updater'); 
- echo $html->para(null, $session->read('Auth.User.username'));
- echo $ajax->div('charging', array('style'=>'display:none'));
-     echo $html->image('static/loading.gif', array('alt'=>'Loading')); 
- echo $ajax->divEnd('charging');
+ echo $html->div(null, 'Chat Room '. $data['Vclassroom']['name'], array('style'=>'font-size:12pt;'));
+ echo  $ajax->div('updater');
+ $M = array_reverse($msgs);
+//foreach ($M as $m):
+   //e($html->div(null,
+   //           '<span style="color:orange;font-size:6pt;">'.$m['Chat']['created']. ' '.$m['User']['username'].'</span>: '.$m['Chat']['message'], array('style'=>'font-size:8pt;')));
+//endforeach;
+ echo  $ajax->divEnd('updater');
+ 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');
 
  echo $ajax->form();
  echo $form->hidden('Chat.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
  echo $form->hidden('Chat.teacher_id', array('value'=>$blog['User']['id']));
- echo $form->hidden('Chat.sender_id', array('value'=>$session->read('Auth.User.username')));
- echo $form->input('Chat.message', array('size' => 60, 'maxlength'=>60, 'title'=>__('Message', true), 'between'=>': '));
- echo $ajax->submit(__('Send', true)), array("url" => "/vclassrooms/savemessage/", 
-                                         "update"=>"updater",
+ echo $form->hidden('Chat.student_id', array('value'=>$session->read('Auth.User.id')));
+ echo $form->input('Chat.message', array('size' => 60, 'maxlength'=>95, 'title'=>__('Message', true), 'between'=>':<br /> ', 'value'=>''));
+ echo $ajax->submit(__('Send', true), array("url"  => "/vclassrooms/savemessage/", 
+                                         "update"  => "updater",
+                     "after"   => "clean()",
                                          "loading" => "Element.show('charging');Element.hide('updater')",
-                                         "complete" => "Element.hide('charging');Effect.Appear('updater')"
+                     "complete"=> "Element.hide('charging');Effect.Appear('updater')")
         );
 endif;
 ?>
+<script type="text/javascript">
+//<![CDATA[
+function clean()
+{
+  var message = document.getElementById('ChatMessage');
+  message.value = '';
+  return true;
+}
+
+function ping() {
+  // Send ping, to let the server know I'm still here
+  var url = base_url + 'ping.php';
+  var pars = creds();
+
+  var ajax = new Ajax.Request(url, {method: 'post', parameters: pars, onComplete: handle_ping});
+
+  Logger.info("Sent Ping: " + pars);
+}
+//]]>
+</script> 

trunk/app/views/vclassrooms/show.ctp

@@ -19 +19 @@
    $t="javascript:window.open('/vclassrooms/chat/".$blog['User']['id']."/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
       echo $html->link(
-         $html->image('static/icon_webquest.jpg', array('alt'=>'Chat','title'=>'Chat','style'=>'margin-right:12px')
+         $html->image('static/feature_chatroom.jpg', array('alt'=>'Chatroom','title'=>'Chatroom','style'=>'margin-right:12px')
      ), '#', array("onclick"=>$t), null, null, false);