Changeset 438

Timestamp:

04/28/08 17:15:07 (9 months ago)

Author:

aarkerio

Message:

Treasures changes

Location:

trunk/app

Files:

• config/sql/postgresql/treasures_vclassrooms.sql (modified) (1 diff)
• controllers/helps_controller.php (modified) (3 diffs)
• controllers/images_controller.php (modified) (7 diffs)
• controllers/tests_controller.php (modified) (1 diff)
• controllers/treasures_controller.php (modified) (5 diffs)
• models/treasure.php (modified) (2 diffs)
• views/helps/admin_edit.ctp (modified) (2 diffs)
• views/images/admin_add.ctp (modified) (1 diff)
• views/images/admin_listing.ctp (modified) (1 diff)
• views/treasures/admin_edit.ctp (modified) (1 diff)
• views/treasures/admin_listing.ctp (modified) (1 diff)
• webroot/img/imgusers/aarkerio_12.jpg (modified) (previous)

trunk/app/config/sql/postgresql/treasures_vclassrooms.sql

@@ -1 +1 @@
 --HABTM
 CREATE TABLE "treasures_vclassrooms" (
-  "treasure_id"   int NOT NULL REFERENCES treasures(id),
-  "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
-  PRIMARY KEY  ("vclassroom_id", "treasure_id")
+ "id" serial PRIMARY KEY,
+ "treasure_id" int NOT NULL REFERENCES treasures(id) ON DELETE CASCADE,
+ "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
+  UNIQUE  ("treasure_id", "vclassroom_id")
 );
 

trunk/app/controllers/helps_controller.php

@@ -8 +8 @@
 *  @package Karamelo
 */
-// file : app/controller/faqs_controller.php
+// file : app/controller/helps_controller.php
 
 uses('sanitize');
@@ -118 +118 @@
      if (!empty($this->data['Help']))
      {
+          //die(debug($this->data['Help']));
         $this->Sanitize = new Sanitize;
         
@@ -126 +127 @@
         $this->Help->create();
 
-          if ($this->Help->save($this->data['Help']))
-      {
-          $id = $this->Help->getLastInsertID();
+        if ($this->Help->save($this->data['Help']))
+         {
+               $id = $this->Help->getLastInsertID();
               $this->msgFlash('Help saved','/admin/helps/edit/'.$id);
-       }
+         }
       } 
  }

trunk/app/controllers/images_controller.php

@@ -8 +8 @@
 *  @package Karamelo
 */
-// file : app/controller/faqs_controller.php 
+// file : app/controller/images_controller.php
+
 uses('sanitize');
 
 class ImagesController extends AppController
 {
-  public $helpers       = array('Ajax',  'User');
-    
+  public $helpers       = array('Ajax');
+  
   public $components    = array('Adds');
-
+  
   public function isAuthorized() 
   {      
@@ -28 +29 @@
     return false;  // go away !!
  }
-  
-  public function index($id = null)
-  {
-        $this->pageTitle = 'View Active Users';
-        $this->set('data', $this->User->findAll()); 
-        $this->set('color', 'blue');
-  }
-  /***
-  === ADMIN METHODS
-  ***/    
-  public function admin_listing($set = null)
-  {   
+ 
+ /***  === ADMIN METHODS  ***/
+ 
+ public function admin_listing($set = null)
+ {   
         // $set defines if display in admin layout or in small popup window
         if ($set == null)
@@ -62 +56 @@
         $order      = "Image.id DESC";
         
-        $data       = $this->Image->findAll($conditions, $fields, $order, $limit);
-        
-        $this->set('data', $data);
-    }
-   
-    public function admin_add($type = null) 
-    {
-    
-    //die(print_r($this->data));
-    
+        $this->set('data', $this->Image->findAll($conditions, $fields, $order, $limit));
+    }
+   
+ public function admin_add($set = null) 
+ {
+    
+    //die(debug($this->data));
+     
+    if ($this->data['Image']['file']['error'] == 1)
+    {
+         $this->flash('Error uploading image, please contact the support team', '/admin/images/listing');
+     }
+     
     $this->layout    = 'admin';
     
@@ -92 +89 @@
     /** uploaddir:  directory relative to where script is running */
     
-    if ( isset($type) && $type == 'avatar')   // avatar or user image?
-    {
-        $uploaddir    = "../webroot/img/avatars";
-    } 
-    else 
-    {
-        $uploaddir    = "../webroot/img/imgusers";
-    }
+    $uploaddir    = "../webroot/img/imgusers";
     
     $maxfilesize  = 2097152; /** 2MB max size */
@@ -127 +117 @@
     if ( $imgfile_size > $maxfilesize) 
     {
-     $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
+          $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
          $ErrMsg .= "<p>Bigger than 2.0 MB <br><br>";
          $ErrMsg .= "Current size: " . $imgfile_size ."</p>\n";
@@ -163 +153 @@
        }
    }
-   
-   /*** Create thumb***/
-    if ( $type != 'avatar')
-    {
-         $this->createThumb($final_filename);
-    }
+    
+   /**  made thumb **/
+   $this->createThumb($final_filename);
+    
    /** Database stuff  **/
    
@@ -179 +167 @@
    {     
      $this->redirect($this->data['Image']['return']); //go back to display gallery
-     exit();
    }
    

trunk/app/controllers/tests_controller.php

@@ -162 +162 @@
  }
 
- private function chk($user_id) // preview tests before send
+ private function chk($user_id) // preview tests before send, this method is for 0.3 version    
  {
     try {

trunk/app/controllers/treasures_controller.php

@@ -5 +5 @@
 *  GPLv3 manuel<at>mononeurona<dot>org
 */ 
+//File: /app/controllers/treasures_controller.php
+
+
 uses('sanitize');
+uses('L10n');
 
 class TreasuresController extends AppController {
@@ -19 +23 @@
         if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )  // admin and teachers
         {
-        return true;
+           return true;
         } 
     } 
@@ -91 +95 @@
   }
   
-  public function admin_add()
-  {
+  public function admin_vclassrooms($treasure_id)
+  {    
+   $this->pageTitle = $this->Auth->user('username') . '\'s Treasure';
+      
+   $this->layout = 'admin';
+      
+   $conditions   = array('Vclassroom.user_id'=>$this->Auth->user('id'), 'Vclassroom.status'=>1);
+   
+   $this->set('data', $this->Treasure->Vclassroom->findAll($conditions)); 
+
+   $this->Treasure->unbindModel(array('belongsTo'=>array('User')));
+
+   $this->set('treasures',$this->Treasure->TreasuresVclassroom->findAll(array('TreasuresVclassroom.treasure_id' => $treasure_id)));
+   
+   $this->set('treasure_id', $treasure_id);
+ }
+ 
+  public function admin_link2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['TreasuresVclassroom']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['TreasuresVclassroom']);
+                 
+      $this->Treasure->TreasuresVclassroom->create();
+      
+      if ( $this->Treasure->TreasuresVclassroom->save($this->data['TreasuresVclassroom']))
+      {
+               $this->msgFlash('Treasure assigned', '/admin/treasures/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
+ }
+
+  public function admin_unlink2class() 
+ {
+    $this->layout    = 'admin';
+    // add to database
+   if ( !empty($this->data['TreasuresVclassroom']) )
+   {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->clean($this->data['TreasuresVclassroom']);
+                 
+      if ( $this->Treasures->TreasuresVclassroom->delete($this->data['TreasuresVclassroom']['id']))
+      {
+               $this->msgFlash('Test unlinked', '/admin/tests/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
+      }
+      else
+      { 
+              die('Something is wrong, please report this bug');
+      }
+   }
+ }
+ 
+ public function admin_add()
+ {
        $this->layout    = 'admin';
        // adds new blog entries 
        if ( !empty($this->data['Treasure']) )  
-     { 
-      $this->Sanitize = new Sanitize;
-      
+        { 
+           $this->Sanitize = new Sanitize;
+          
           $this->Sanitize->html($this->data["Treasure"]["title"]);
-
+          
           $this->Sanitize->html($this->data["Treasure"]["instructions"]);
          
@@ -109 +174 @@
           if ($this->Treasure->save($this->data['Treasure']))
           { 
-         $id = $this->Treasure->getLastInsertId();
-             $this->msgFlash('Treasure registered', '/admin/treasures/edit/'.$id);
+              $id = $this->Treasure->getLastInsertId();
+             $this->msgFlash('Treasure saved', '/admin/treasures/edit/'.$id);
           } 
           else 
@@ -162 +227 @@
  }
  
- public function admin_delete($id)
- {
-    $this->Treasure->del($id);
-    
-    $this->msgFlash('Treasure deleted', '/admin/treasures/listing');
-  }
+ public function admin_delete()
+ {
+    if ($this->Treasure->del($this->data['Treasure']['id']))
+     {
+      $this->msgFlash('Treasure deleted', '/admin/treasures/listing');
+    }
+ }
 }
 ?>

trunk/app/models/treasure.php

@@ -1 +1 @@
 <?php
-/**  Chipotle Software 2002-2007 GPLv3 **/
+/**
+*  Karamelo eLearning Platform
+*  Chipotle Software 2002-2008 
+*  GPLv3 manuel<arroba>mononeurona<punto>org
+**/ 
+
 class Treasure extends AppModel {
 
@@ -6 +11 @@
    
    public $belongsTo = 'User';
-
+   
+    public $hasAndBelongsToMany = array('Vclassroom' =>
+                       array('className'             => 'Vclassroom',
+                         'joinTable'             => 'treasures_vclassrooms',
+                         'foreignKey'            => 'treasure_id',
+                         'associationForeignKey' => 'vclassroom_id',
+                         'conditions'            => null,
+                         'order'                 => null,
+                         'limit'                 => '',
+                         'unique'                => true,
+                         'finderQuery'           => '',
+                         'deleteQuery'           => ''
+                         )
+                            );   
+    
    public $validate = array(
       'user_id' => VALID_NOT_EMPTY,

trunk/app/views/helps/admin_edit.ctp

@@ -15 +15 @@
 <tr>
   <td>
-  <?php echo $html->input('Help.url', array("size" => 30, "maxlength" => 100)); ?>
+  <?php echo $form->input('Help.url', array("size" => 30, "maxlength" => 100)); ?>
 
 </td>
 <td>
    <?php 
-    echo $form->labe('Help.lang', 'Lang:') .'<br />';
+    echo $form->label('Help.lang', 'Lang:') .'<br />';
     $langs = array("en"=>"English", "es"=>"Espanol", "fr"=>"Francaise", "de"=>"Deutschland", "af"=>"Afrikaans", "id"=>"Indonesian");
     echo $form->select('Help.lang', $langs, null, null, null, false); 
@@ -33 +33 @@
 <tr><td colspan="3">
    <?php 
-     echo $form->label('Help.help', 'Help:' );
-     echo $form->textarea('Help.help', array('cols'=>80, 'rows'=>25)) 
-     echo $fck->load('HelpHelp', 'Karamelo', 700, 300); 
+     echo $form->label('Help.help', 'Help:');
+     echo $form->textarea('Help.help', array('cols'=>80, 'rows'=>25)); 
+     echo $fck->load('HelpHelp', 'Karamelo', 700, 600); 
    ?> 
 </td></tr>
 
 <tr>
-  <td colspan="3"><?php echo $form->label( 'Help.end', 'End edition:' ); echo $form->checkbox('Help.end', array('value'=>1)); ?></td>
+  <td colspan="3"><?php echo $form->label( 'Help.end', 'End edition:') . $form->checkbox('Help.end', array('value'=>1)); ?></td>
 </tr>
 <tr><td colspan="3">

trunk/app/views/images/admin_add.ctp

@@ -1 @@
-<?php echo $javascript->link('myfunctions'); ?>
-
-<div class="title_section">Add new image</div>
-
-<div class="spaced">
-
-<?php echo $html->formTag('/images/add/','post', array("enctype"=>"multipart/form-data") ); ?>
-<?php echo $html->hiddenTag('Image/user_id', $othAuth->user('id')); ?>
-<?php echo $html->hiddenTag('return', '/users/edit'); ?>
+<?php 
+ echo $javascript->link('myfunctions');
+ 
+ echo $html->div('title_section', 'Add new image');
+ 
+ echo $form->create('Image', array("enctype"=>"multipart/form-data") );
+ echo $form->hidden('return', array('value'=>'/admin/images/listing')); 
+?>
   
 <fieldset>
   <legend>Image</legend>
-   
-   <p>
-   <?php echo $form->labelTag( 'Image/file', 'Title:' );?><br />
-   <?php echo $html->file('Image/file'); ?>
-   <?php echo $html->tagErrorMsg('Image/file', 'Title is required.'); ?>
-  
-  <br />
-  <?php echo $html->submit('Upload'); ?>
+   <?php 
+     echo $form->label( 'Image.file', 'Title:' );
+    echo $form->file('Image.file'); 
+    echo $form->end('Upload'); 
+  ?>
 </fieldset>
-</form>
-</div>
+

trunk/app/views/images/admin_listing.ctp

@@ -19 +19 @@
   <td style="text-align:left;" colspan="5">  
   <?php 
-     echo $form->create('Image', array('action'=>'add', 'enctype'=>'multipart/form-data')); 
+     echo $form->create('Image', array('enctype'=>'multipart/form-data')); 
      echo $form->hidden('Image.return', array('value'=>'/admin/images/listing/'.$return)); 
   ?>
   <fieldset>
-     <legend>Upload Image</legend>
+     <legend><?php echo __('Upload Image'); ?></legend>
      
-     <?php echo $form->label('Image.file', 'File:' );
+     <?php echo $form->label('Image.file', 'File:');
            echo $form->file('Image.file'); 
-           echo $form->error('Image.file', 'Title is required.'); 
-           echo '</fieldset>';
+           echo $form->error('Image.file', 'File is required.');
            echo $form->end('Upload'); 
       ?>
+  </fieldset>
 </td>
 </tr>

trunk/app/views/treasures/admin_edit.ctp

@@ -2 +2 @@
 
  echo $html->addCrumb('Control Tools', '/admin/entries/start');  
- echo $html->addCrumb('News', '/admin/treasures/listing'); 
+ echo $html->addCrumb('Treasures', '/admin/treasures/listing'); 
  echo $html->getCrumbs(' / '); 
  echo $form->create('Treasure',array('onsubmit'=>'return chkForm()')); 

trunk/app/views/treasures/admin_listing.ctp

@@ -17 +17 @@
          echo $html->div('butonright', $gags->sendEdit($val['Treasure']['id'], 'treasures'));
          echo $html->div('div_title', $val['Treasure']['title']);
-         echo $html->para(null, '<b>Treasure description:</b> '.$val['Treasure']['description']);
 
-         echo $html->link('Questions', '/admin/treasures/questions/'.$val['Treasure']['id']);
-         echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions', 'title'=>'Questions')), 
-                          '/admin/treasures/questions/'.$val['Treasure']['id'], null, null, false) . '<br />';
          if ( count($val['Vclassroom']) < 1 ) 
          {