Changeset 54

Timestamp:

08/09/07 12:55:08 (17 months ago)

Author:

aarkerio

Message:

General update

Location:

trunk/app

Files:

• config/sql/karamelo.sql (modified) (1 diff)
• controllers/catglossaries_controller.php (modified) (2 diffs)
• controllers/lessons_controller.php (modified) (4 diffs)
• controllers/tests_controller.php (modified) (1 diff)
• controllers/vclassmembers_controller.php (modified) (3 diffs)
• controllers/vclassrooms_controller.php (modified) (5 diffs)
• views/elements/subjects.thtml (modified) (1 diff)
• views/elements/vclassrooms.thtml (modified) (1 diff)
• views/galleries/admin_listing.thtml (modified) (1 diff)
• views/lessons/admin_add.thtml (modified) (1 diff)
• views/lessons/admin_listing.thtml (modified) (1 diff)
• views/questions/questions.thtml (modified) (1 diff)
• views/tests/admin_questions.thtml (modified) (3 diffs)
• views/vclassrooms/admin_add.thtml (modified) (3 diffs)
• views/vclassrooms/admin_edit.thtml (modified) (2 diffs)
• views/vclassrooms/admin_listing.thtml (modified) (2 diffs)
• views/vclassrooms/show.thtml (modified) (1 diff)

trunk/app/config/sql/karamelo.sql

@@ -245 +245 @@
 INSERT INTO permissions (id, name) VALUES (64, 'admin/glossaries/listing');
 --Categories Glossaries
-INSERT INTO permissions (id, name) VALUES (65, 'catglossaries/add');
-INSERT INTO permissions (id, name) VALUES (66, 'catglossaries/edit');
-INSERT INTO permissions (id, name) VALUES (67, 'catglossaries/delete');
-INSERT INTO permissions (id, name) VALUES (68, 'catglossaries/listing');
+INSERT INTO permissions (id, name) VALUES (65, 'admin/catglossaries/add');
+INSERT INTO permissions (id, name) VALUES (66, 'admin/catglossaries/edit');
+INSERT INTO permissions (id, name) VALUES (67, 'admin/catglossaries/delete');
+INSERT INTO permissions (id, name) VALUES (68, 'admin/catglossaries/listing');
 --E-courses
 INSERT INTO permissions (id, name) VALUES (69, 'admin/ecourses/add');

trunk/app/controllers/catglossaries_controller.php

@@ -26 +26 @@
     }
     
-    public function listing()
+    /*** 
+    === ADMIM METHODS
+    ***/
+    public function admin_listing()
     {
         $this->layout = 'admin';
@@ -38 +41 @@
         $this->set('data', $this->Catglossary->findAll( $conditions, $fields, $order, null, null, false)); 
     
-    }
-    
-    public function add()
-    {
+ }
+ 
+ public function admin_add()
+ {
         $this->layout = 'admin';
         // adds new classroom to database
-       if (!empty($this->params['data']))
+       if (!empty($this->data))
        {
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
+        $this->Sanitize->cleanArray($this->data["Catglossary"]); //Hopefully this is enough
         
-        if ($this->Catglossary->save($this->params['data']))
-       {
-           //$this->set('data', $this->Catglossaries->index());
-           $this->flash('Your Category Glossary has been saved.','/catglossaries/listing');
-           
-       //$this->render('todo', 'ajax');
-      }
+        $this->Catglossary->clearUpFields();
+        $this->Catglossary->create();
+        
+        if ($this->Catglossary->save($this->data["Catglossary"]))
+        {
+           $this->flash('Category Glossary saved.','/admin/catglossaries/listing');
+        }
     }    
+ }
+
+public function admin_edit($id=null)
+{
+     $this->layout    = 'admin';
+     
+     if ( empty( $this->data["Catglossary"] ) )
+     {
+         $this->Catglossary->id  = $id;
+         
+         $this->data      = $this->Catglossary->read();
+     }
+     else
+     {   
+         $this->Sanitize = new Sanitize;
+         
+         $this->Sanitize->html($this->data["Catglossary"]["title"]);
+         
+         $this->Sanitize->html($this->data["Catglossary"]["body"]);
+         
+         if ($this->Catglossary->save($this->data["Catglossary"]))
+         {  
+            $this->msgFlash('Your category has been saved!', '/admin/catglossaries/edit/'.$this->data["Catglossary"]["id"]);
+         }
+     }
+ }
+ 
+ public function admin_delete($id)
+ {
+      if ($this->Catglossary->del($id))
+      {
+          $this->msgFlash('Category deleted', '/admin/catglossaries/listing');
+      }
     }
   }

trunk/app/controllers/lessons_controller.php

@@ -10 +10 @@
 class LessonsController extends AppController
 {
-    public $helpers       = array('Ajax', 'Form', 'User', 'Fck');
+    public $helpers       = array('Ajax', 'Form', 'User', 'Fck', 'Gags');
     
     public $components    = array('Edublog');
@@ -49 +49 @@
     }
     
-    public function all($user_id) {
-        
+    public function all($user_id) 
+    {   
         $this->LessonTitle = 'Portfolio Blog';
         
@@ -67 +67 @@
     }
     
+    /***
+    === ADMIN METHODS
+    ****/
     public function admin_listing()
     {   
@@ -85 +88 @@
    
    
-   public function add()
+   public function admin_add()
    {
-        $this->layout    = 'admin';
-        // adds new classroom to database
-    if (!empty($this->params['data']))
+    $this->layout    = 'admin';
+    
+    if (!empty($this->data["Lesson"]))
     {
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
+        $this->Sanitize->html($this->data["Lesson"]["title"]);
         
-          if ($this->Lesson->save($this->params['data']))
-      {
-           $this->redirect('/lessons/listing/');
-      }
+        $this->Sanitize->html($this->data["Lesson"]["body"]);
+        
+        $this->data["Lesson"]["user_id"] = $this->othAuth->user('id');; 
+        
+        if ($this->Lesson->save($this->data["Lesson"]))
+        {
+           $this->msgFlash('Lesson saved', '/admin/lessons/listing/');
+        }
     }
-   }
+  }
+ 
+public function admin_edit($id=null)
+{
+     $this->layout    = 'admin';
+     
+     if ( empty( $this->data["Lesson"] ) )
+     {
+         $this->Lesson->id  = $id;
+         
+         $this->data      = $this->Lesson->read();
+     }
+     else
+     {   
+         $this->Sanitize = new Sanitize;
+         
+         $this->Sanitize->html($this->data["Lesson"]["title"]);
+         
+         $this->Sanitize->html($this->data["Lesson"]["body"]);
+         
+         if ($this->Lesson->save($this->data["Lesson"]))
+         {   
+             if ( $this->data["Lesson"]["end"] == 1 )
+             {
+                                 $this->redirect('/admin/lessons/listing');
+             }
+             else
+             {
+                                 $this->msgFlash('Your story has been saved!', '/admin/lessons/edit/'.$this->data["Lesson"]["id"]);
+             }
+        }
+     }
+ }
+ 
+ public function admin_delete($id)
+ {
+      if ($this->Lesson->del($id))
+      {
+          $this->msgFlash('Lesson deleted', '/admin/lessons/listing');
+      } 
+      else
+      {
+           $this->flash('Error, call support', '/admin/lessons/listing');
+      }
+  }
 }
 ?>

trunk/app/controllers/tests_controller.php

@@ -11 +11 @@
   public $helpers = array('Form', 'Ajax');
   
-  public function index(){
+  public function index()
+  {
         
         $number = $this->Test->findCount();  

trunk/app/controllers/vclassmembers_controller.php

@@ -1 +1 @@
 <?php
-/*
+/**
 *  Karamelo E-Learning Platform
-*  Manuel Montoya 2002-2006 
-*  GPL manuel<at>mononeurona.org
+*  Manuel Montoya 2002-2007
+*  Chipotle Software GPLv3 manuel<at>mononeurona.org
 */ 
  
@@ -27 +27 @@
    }
    
-   public function add($user_id = null, $classroom_id = null, $student_id = null)
+   public function jointoclass()
    {
-    
-    $this->Vclassroom = new Vclassroom;  //Instantiate the model   
-    
-    if (empty($this->params['data'])) {
+    if (!empty($this->data["Vclassmember"])) 
+    {   
+        $code = $this->Vclassmember->Vclassroom->field('code', array("Vclassroom.id"=>$this->data['Vclassmember']['vclassroom_id']));
         
-        $this->layout    = $this->Edublog->layout($user_id);
-        $this->set('blog', $this->Edublog->blog($user_id));
-        
-        $conditions = array("id"=>$classroom_id);
-        
-        $fields = array("id", "name", "invitation", "code");
-        
-        $data = $this->Vclassroom->find($conditions, $fields, null, true);
-        
-        //echo $data['Vclassroom']['code'];
-        
-        $check = $this->chkMember($classroom_id);
-        
-        $this->set('check', $check);
-        
-        $this->set('data', $data);
-    
-    }
-    else  // adds new classroom to database
-    { 
-        $this->Sanitize = new Sanitize;
-        
-        $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
-        
-        //print_r($this->params['data']);
-        
-        //die(print_r($data));
-        
-        //echo $data['Vclassroom']['code'];
-        
-        if ( $this->params['data']['Vclassmember']['invitation'] == 1 )
-        { 
-            $code = $this->Vclassroom->field('code', array("Vclassroom.id"=>$this->params['data']['Vclassmember']['vclassroom_id']));
+        if ($code != $this->data['Vclassmember']['code'] || $code == null) //code is correct
+        {
+            $this->set('msg', 'Code is incorrect');
+            $this->render('jointoclass', 'ajax');
+            exit();
+        }
+        elseif($this->chkMember($this->data['Vclassmember']['vclassroom_id'])) // the studen is not member
+        {
+            $this->set('msg', 'You are already member of this class!');
+            $this->render('jointoclass', 'ajax');
+            exit();
+         
+        }
+        else
+        {
+            $this->data['Vclassmember']['vclassroom_id'];
             
-            if ($this->params['data']['Vclassmember']['code'] != $code)
-            {
-              die($this->flash('Your code is invalid', '/vclassmembers/add/'.$this->params['data']['Vclassmember']['user_id'].'/'.$this->params['data']['Vclassmember']['vclassroom_id']));
+            $this->data['Vclassmember']['user_id']   = $this->othAuth->user('id');
+            
+            $this->Vclassmember->create();
+            
+            if ($this->Vclassmember->save($this->data['Vclassmember']))
+            {  
+               $this->set('msg', 'You have joined to this class succesfully!');
+               $this->render('jointoclass', 'ajax');
+               exit();
             }
         }
-        
-        if ($this->Vclassmember->save($this->params['data']))
-        { 
-          $link = '/vclassrooms/show/'. $this->params['data']['Vclassmember']['user_id'] .'/'. $this->params['data']['Vclassmember']['vclassroom_id'];
-             
-          $this->flash('Your has been added to classroom.', $link);
-        }
     }
-    
  }
+ 
  //Check if the user already exist in the classroom
- protected function chkMember($classroom_id)
- {
-   $check      = true;
-   
-   $user_id    = $this->othAuth->user('id');
-   
-   $conditions = array('"Vclassmember"."user_id"'=>$user_id, '"Vclassmember"."vclassroom_id"'=>$classroom_id);
+ protected function chkMember($vclassroom_id)
+ { 
+   $conditions = array('"Vclassmember"."user_id"'=>$this->othAuth->user('id'), '"Vclassmember"."vclassroom_id"'=>$vclassroom_id);
    
    $val = $this->Vclassmember->field('id', $conditions);
    
    if ( $val === false)
-    {
-     $check = false;
-    }
-   
-   return $check;
+   {
+         return false;
+   }
+   else
+   {
+         return true;
+   }
  }
   
-  public function edit($id = null)
+  public function admin_edit($id = null)
   {
     if (empty($this->data))
@@ -119 +98 @@
 }
   
-  public function delete($id)
+  public function admin_delete($id)
   {
         // deletes task from database
         $this->Vclassmember->del($id);
-        $this->flash('Your virtual classroom  has been updated.','/vclassrooms');
+        $this->msgFlash('Stuent has been deleted','/admin/vclassrooms/start');
   }
-  
 }

trunk/app/controllers/vclassrooms_controller.php

@@ -10 +10 @@
 class VclassroomsController extends AppController
 {  
-   public $helpers       = array('Ajax', 'Form', 'Fck');
+   public $helpers       = array('Ajax', 'Form', 'Fck', 'Gags');
    
    public $components    = array('Edublog');
-   
-   public function listing()
-   {
+
+   public function show($user_id, $id) 
+    {
+        
+        $this->pageTitle = 'Classrooms';
+        $this->layout    = $this->Edublog->layout($user_id);
+        $this->set('blog', $this->Edublog->blog($user_id));
+        
+        $conditions = array("Vclassroom.status"=>1, "Vclassroom.id"=>$id);
+        $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.description", "Vclassroom.subject_id", "Vclassroom.created", "Vclassroom.user_id", "Subject.title");
+        $order      = "Vclassroom.name DESC";
+        
+        $this->set('data', $this->Vclassroom->find($conditions, $fields, $order, null, null, 2, 2));
+    }
+     
+/***
+== ADMIN METHODS
+***/   
+ public function admin_listing()
+ {
       $this->layout = 'admin';
       $conditions = array("user_id"=>$this->othAuth->user('id'));
@@ -30 +47 @@
    }
    
-   public function show($user_id, $id) {
-        
-        $this->pageTitle = 'Classrooms';
-        $this->layout    = $this->Edublog->layout($user_id);
-        $this->set('blog', $this->Edublog->blog($user_id));
-        
-        $conditions = array("Vclassroom.status"=>1, "Vclassroom.id"=>$id);
-        $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.description", "Vclassroom.subject_id", "Vclassroom.created", "Vclassroom.user_id");
-        $order      = "Vclassroom.name DESC";
-        
-        $this->set('data', $this->Vclassroom->findAll($conditions, $fields, $order, null, null, 2, 2));
-    }
-   
-   public function add() {
+    public function admin_add() {
     
-    // adds new classroom to database
-    if (!empty($this->params['data']))
+    if (!empty($this->data["Vclassroom"]))
     {
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
+        $this->Sanitize->cleanArray($this->data["Vclassroom"]); //Hopefully this is enough
         
-        if ($this->Vclassroom->save($this->params['data']))
+        if ($this->Vclassroom->save($this->data["Vclassroom"]))
          {
-           $this->redirect('/vclassrooms/listing');
-         }
-    } else {
+           $this->redirect('/admin/vclassrooms/listing');
+         }
+    } 
+    else 
+    {
       $this->layout = 'admin';
       
@@ -69 +74 @@
       $O = $this->Vclassroom->field('order', $conditions, $order);
       
-      $Order = $O + 1;
+      $Order = $O + 1; //patch to list 1=>1
       
       $this->set('Order', $Order);
@@ -75 +80 @@
         
  }
- 
-  public function edit($id = null)
+  /**
+  *  
+  *  args id 
+  *  
+  **/ 
+  public function admin_edit($id = null)
   {
-     
     if (empty($this->data))
     {
@@ -93 +101 @@
     else
     {
-        if ($this->Vclassroom->save($this->data['Vclassroom']))
-        {
-            $this->flash('Your virtual classroom  has been updated.','/vclassrooms/listing');
-        }
+         $this->Sanitize = new Sanitize;
+       
+       $this->Sanitize->cleanArray($this->data["Vclassroom"]); //Hopefully this is enough
+       
+       if ($this->Vclassroom->save($this->data['Vclassroom']))
+       {
+          $this->msgFlash('Your virtual classroom  has been updated.','/admin/vclassrooms/listing');
+       }
     }
 }
   
-  public function delete($id)
+  public function admin_delete($id)
   {
-        // deletes task from database
         if ($this->Vclassroom->del($id))
-        {
-          $this->redirect('/vclassrooms/listing');
-        } 
-        else
-        {
-           $this->flash('Error, call support', '/vclassrooms/listing');
-        }
+      {
+          $this->msgFlash('Classroom deleted','/admin/vclassrooms/listing');
+      } 
+      else
+      {
+           $this->flash('Error, call support', '/admin/vclassrooms/listing');
+      }
   }
   

trunk/app/views/elements/subjects.thtml

@@ -2 +2 @@
     echo '<div style="text-align:center;margin:15px auto 15px auto;">';
     echo  $ajax->link($html->image("static/subjects.png", array("alt"=>"Subjects", "title"=>"Subjects", "style"=>"border:1px solid #fff")), '/subjects/display', array("update" => "qn",
-    "loading"=>"Element.show('loading3');", "complete"=>"Element.hide('loading3');Effect.Appear('updater')"), 
+    "loading"=>"Element.show('loading3');", "complete"=>"Element.hide('loading3');Effect.Appear('qn')"), 
                 null, false);
     echo "</div>";

trunk/app/views/elements/vclassrooms.thtml

@@ -1 +1 @@
 <div class="temas">Classrooms</div>
-<?
-//var_dump($podcast);
-
-foreach ($blog[0]["Vclassroom"] as $key => $val) {
-  echo '<a class="petit" href="/vclassrooms/show/'.$val['user_id'].'/'. $val['id'] . '">&gt;'. $val['name'] . '</a><br />';
+<?php
+foreach ($blog[0]["Vclassroom"] as $key => $val) 
+{
+  echo $html->link($val['name'], '/vclassrooms/show/'.$val['user_id'].'/'. $val['id'], array("class"=>"petit")) . "<br />\n";
 }
-
 ?>
 

trunk/app/views/galleries/admin_listing.thtml

@@ +1 @@
+<script type="text/javascript">
+   window.onload = timedMsg;
+</script>
+<?php $session->flash(); ?>
 <?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
 <?php echo $html->getCrumbs(' / '); ?>
 
-<p><?php echo $html->link($html->image('admin/new.gif', array("alt"=>"Add new gallery", "title"=>"Add new gallery")), '/admin/galleries/add', null, false, false) ?></p>
+<p><?php echo $html->link($html->image('admin/new.gif', array("alt"=>"Add new page", "title"=>"Add new page")), '/admin/galleries/add', null, false, false) ?></p>
 
 <table class="tbadmin">

trunk/app/views/lessons/admin_add.thtml

@@ -4 +4 @@
 ?>
 
-<div class="title_section">Add new Lesson</div>
-
-<div class="spaced">
-
-<?php echo $html->formTag('/lessons/add/','post'); ?>
+<?php echo $html->formTag('/admin/lessons/add/','post'); ?>
 <fieldset>
-  <p>
-  <?php echo $form->labelTag( 'Lesson/title', 'Title:' );?><br />
-  <?php echo $html->input('Lesson/title', array("size" => 50, "maxlength" => 120, "class"=>"formas")); ?>
-  <?php echo $html->tagErrorMsg('Lesson/title', 'Title is required.'); ?>
-  <br /><br />
-  
-  <p><?php echo $form->labelTag( 'Lesson/body', 'Body:' );?><br />
-  <?php echo $html->textarea('Lesson/body', array("class"=>"formas", "cols"=>80, "rows"=>45)) ?>
-  <?php echo $fck->load('Lesson/body', 'Karamelo'); ?> 
-  <?php echo $html->tagErrorMsg('Lesson/body', 'Body is required.'); ?>
-  <br />
-  </p>
-  
-  <p><?php echo $form->labelTag( 'Lesson/status', 'Published:' );?><br />
-  <?php echo $html->checkbox('Lesson/status'); ?>
-  <br /><br />
-  
-  <p><?php echo $form->labelTag( 'Lesson/disc', 'Comments allowed to this Lesson:' );?><br />
-  <?php echo $html->checkbox('Lesson/disc'); ?>
-  <br /><br />
-  
-  <?php echo $html->hiddenTag('Lesson/user_id', $othAuth->user('id')) ?>
-  
-  
-  <br />
-  <?php echo $html->submit('Send'); ?>
+<legend>Add Lesson</legend>
+<table>
+<tr><td>
+  <?php 
+     echo $form->labelTag( 'Lesson/title', 'Title:' );
+     echo $html->input('Lesson/title', array("size" => 50, "maxlength" => 120, "class"=>"formas"));
+     echo $html->tagErrorMsg('Lesson/title', 'Title is required.'); 
+  ?>
+  </td>
+  <td>
+  <?php echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), '#', array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false) ?>
+</td>
+</tr>
+<tr>
+  <td colspan="2">
+  <?php 
+      echo $form->labelTag( 'Lesson/body', 'Body:' );
+      echo $html->textarea('Lesson/body', array("class"=>"formas", "cols"=>80, "rows"=>45));
+      echo $fck->load('Lesson/body', 'Karamelo');
+      echo $html->tagErrorMsg('Lesson/body', 'Body is required.'); 
+  ?>
+  </td></tr>
+  <tr><td>
+  <?php 
+     echo $form->labelTag( 'Lesson/status', 'Published:' );
+     echo $html->checkbox('Lesson/status'); 
+  ?>
+  </td><td>
+  <?php 
+      echo $form->labelTag( 'Lesson/disc', 'Comments allowed to this Lesson:' );
+      echo $html->checkbox('Lesson/disc'); 
+  ?>
+  </td></tr>
+  <tr><td colspan="2"> 
+  <?php echo $html->submit('Save'); ?>
+</td></tr>
+</table>
 </fieldset>
 </form>