change validation reload, sass to new version-format(globals), excel import cellformats(integer float or string

1 files changed, 7 insertions, 7 deletions

diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index 6185b93..b1555c6 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -43,7 +43,7 @@ $(function() {
         $("span#model_" + id + "_status").animate({"opacity": "1"},1000);
         if( status_changed ) {
           $("span#model_" + id + "_status").html(data);        
-          loadModel(id);
+          loadModel(id, 'model');
           id = -1;
         }        
       },
@@ -55,9 +55,9 @@ $(function() {
     return id;
   };
 
-  loadModel = function(id) {
+  loadModel = function(id, view) {
     if(id == "") return -1; 
-    var opts = {method: 'get', action: 'model/' + id };
+    var opts = {method: 'get', action: 'model/' + id + '/' + view, view: view };
     var out = id;
     $.ajax({
       type: opts.method,
@@ -67,7 +67,8 @@ $(function() {
         '_method': 'get'
       },
       success: function(data) {
-        $("div#model_" + id).html(data);
+        if (view == "model") $("div#model_" + id).html(data);
+        if (view == "validation") $("dl#model_validation_" + id).html(data);
       },
       error: function(data) {
         //alert("loadModel error");
@@ -81,7 +82,7 @@ $(function() {
     $("input.model_validation").each(function(){
         if($(this).val() != "Completed") {
           reload_id = this.id.replace("model_validation_","");
-          if(/^\d+$/.test(reload_id)) loadModel(reload_id);
+          if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'validation');
         };
     });
     var validationCheck = setTimeout('checkValidation()',15000);
@@ -107,8 +108,7 @@ jQuery.fn.deleteModel = function(type, options) {
            '_method': 'delete'
          },
          success: function(data) {         
-           $(opts.elem).fadeTo("slow",0).slideUp("slow");
-           $(opts.elem).remove();
+           $(opts.elem).fadeTo("slow",0).slideUp("slow").remove();
          },
          error: function(data) {
            //alert("model delete error!");