From 91f367a54bdb759d268cf270e990a5620199ece3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 4 Apr 2012 17:39:32 +0200
Subject: [PATCH] Adding loading window + some fixes

---
 main/inc/ajax/skill.ajax.php               | 18 ++++++++---
 main/template/default/skill/skill_tree.tpl | 35 ++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php
index 44e8323f5d..e3eb7c013d 100644
--- a/main/inc/ajax/skill.ajax.php
+++ b/main/inc/ajax/skill.ajax.php
@@ -18,10 +18,11 @@ $skill_gradebook = new SkillRelGradebook();
 switch ($action) {
     case 'add':  
         if (isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {            
-            $skill->edit($_REQUEST);    
+            $skill_id = $skill->edit($_REQUEST);    
         } else {
-            $skill->add($_REQUEST);    
+            $skill_id = $skill->add($_REQUEST);    
         }        
+        echo $skill_id;
         break;      
     case 'find_skills':        
         $skills = $skill->find('all', array('where' => array('name LIKE %?% '=>$_REQUEST['tag'])));
@@ -70,7 +71,7 @@ switch ($action) {
         $skills = $skill->get_children($id, $load_user_data);
         
         $return = array();
-        foreach($skills as $skill) {
+        foreach ($skills as $skill) {
             if (isset($skill['data']) && !empty($skill['data'])) {
                 $return[$skill['data']['id']] = array(
                                                     'id'    => $skill['data']['id'],
@@ -78,7 +79,16 @@ switch ($action) {
                                                     'passed'=> $skill['data']['passed']);
             }
         }
-        echo json_encode($return);
+        $success = true;
+        if (empty($return)) {
+            $success = false;
+        }
+        
+        $result = array (
+            'success' => $success,
+            'data' => $return
+        );
+        echo json_encode($result);
         break;
     case 'load_direct_parents':
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
diff --git a/main/template/default/skill/skill_tree.tpl b/main/template/default/skill/skill_tree.tpl
index 6cd46b2f8d..e7943a3c6e 100644
--- a/main/template/default/skill/skill_tree.tpl
+++ b/main/template/default/skill/skill_tree.tpl
@@ -38,6 +38,8 @@ var block_size              = {{skill_visualizer.block_size}};
 //Setting the parent by default 
 var parents = ['block_1'];
 
+
+
 function clean_values() {    
     skills          = []; //current window divs
     parents = ['block_1'];
@@ -53,7 +55,32 @@ function clean_values() {
 }
 
 jsPlumb.ready(function() {
+    var loading = $( "#dialog-loading" );
+    
+    loading.dialog( "destroy" );
+    loading.dialog({
+        autoOpen:false,
+        height: 120,
+        modal: true,
+        zIndex: 10000,
+        resizable :false,        
+        closeOnEscape : false,
+        disabled: true,            
+        open: function(event, ui) { $(this).parent().children().children('.ui-dialog-titlebar-close').hide(); }
+    });
     
+    jQuery.ajaxSetup({
+        beforeSend: function() {
+            loading.dialog( "open" );
+            console.log('before------------------->>');
+        },
+        complete: function(){
+            loading.dialog( "close" );                    
+            console.log('complete------------------->>');
+        },
+        success: function() {}
+    });
+        
     $('#return_to_root').live('click', function(){
         clean_values();
         console.log('Clean values');        
@@ -493,6 +520,14 @@ $(document).ready(function() {
 })();
 
 </script>
+<div id="dialog-loading">
+    <div class="modal-body">
+        <p style="text-align:center">
+            {{ "Loading"|get_lang }}
+        <img src="{{ _p.web_img}}loadingAnimation.gif"/>
+        </p>
+    </div>    
+</div>
 <div id="menu" class="well" style="top:20px; left:20px; width:300px; z-index: 9000; opacity: 0.9;">
     <h3>{{'Skills'|get_lang}}</h3>
     <div class="btn-group">