não lembro, mas foi refactorings gostosos

cmilfont · Feb 19, 2013 · ba3bbff · ba3bbff
1 parent 0450619
commit ba3bbff
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 35 deletions.
diff --git a/app/assets/javascripts/app/controller/Dashboard.js b/app/assets/javascripts/app/controller/Dashboard.js
@@ -2,9 +2,10 @@ Ext.define('Workout.controller.Dashboard', {
   extend: 'Ext.app.Controller',
   loadController: function(button) {
     if(button.controller) {
-      Workout.getApplication()
-             .getController( button.controller )
-             .init(button);
+      var controller = Workout.getApplication()
+                              .getController( button.controller );
+      if (!controller._initialized) controller.init();
+      controller.addTabPanel(button);
     }
   },
   init: function() {

diff --git a/app/assets/javascripts/app/controller/Exercicios.js b/app/assets/javascripts/app/controller/Exercicios.js
@@ -6,36 +6,33 @@
 Ext.define('Workout.controller.Exercicios', {
   extend: 'Ext.app.Controller',
   //requires: [ 'Workout.store.Exercicios'],
-  models: ['Exercicio'],
-  stores: ['Exercicios'],
-  views: [
-  'exercicios.Grid', 
-  'exercicios.Form', 
-  'exercicios.Window'
-  ],
-  addTabPanel: function(button) {
-    var tabpanel = Ext.ComponentQuery.query("dtabpanel")[0];
-
-    tabpanel.addTab({
+  //models: ['Exercicio'],
+  //stores: ['Exercicios'],
+  // views: [
+  // 'exercicios.Grid', 
+  // 'exercicios.Form', 
+  // 'exercicios.Window'
+  // ],
+  addTabPanel: function(button) {            
+    this.getTabPanel().addTab({
       title: "Exercícios",
       itemId: "tab-" + button.controller,
       closable: true,
       controller: button.controller,
       xtype: 'exerciciogrid'
     });
-
   },
-  init: function(button) {
-
+  init: function() {
     this.control({
       "exerciciogrid": {
         afterrender: function(grid) {
           grid.store.load();
         }
       }
     });
-
-    this.addTabPanel(button);
-
+    this._initialized = true;
+  },
+  getTabPanel: function() {
+    return Ext.ComponentQuery.query("dtabpanel")[0];
   }
 });
diff --git a/app/assets/javascripts/app/controller/Rotinas.js b/app/assets/javascripts/app/controller/Rotinas.js
@@ -20,8 +20,8 @@ Ext.define('Workout.controller.Rotinas', {
   //views: ['rotinas.List', 'rotinas.Form', 'rotinas.ExercicioForm'],
   //models: ['Rotina', 'RotinaTree','Item', 'Exercicio'],
   //stores: ['Rotinas'],
-  init: function(button) {
-    this.addTabPanel(button);
+  init: function() {
+    if (!this._initialized) this._initialized = true;
   },
   addTabPanel: function(button) {
     this.getTabPanel().addTab({
@@ -31,12 +31,8 @@ Ext.define('Workout.controller.Rotinas', {
       controller: button.controller,
       xtype: 'rotinaslist'
     });
-
-  }
-
-  , getTabPanel: function() {
-    return Ext.ComponentQuery.query("tabpanel[itemId='tabs']")[0];
-  }
-
-
+  }, 
+  getTabPanel: function() {
+    return Ext.ComponentQuery.query("dtabpanel")[0];
+  } 
 });
diff --git a/app/assets/javascripts/app/view/exercicios/Crud.js b/app/assets/javascripts/app/view/exercicios/Crud.js
@@ -41,8 +41,14 @@ Ext.define("Workout.view.exercicios.Crud", {
       fn: function(btn){
         if(btn == "yes") {
           var model = this.getSelectionModel().selected.first();
-          this.store.remove(model);
-          this.store.sync();
+          model.destroy({
+              success : function() {
+                  this.store.remove(model);
+                  //this.store.sync();
+              },
+              scope: this
+          });
+
         }
       }
     });

diff --git a/app/assets/javascripts/app/view/exercicios/Grid.js b/app/assets/javascripts/app/view/exercicios/Grid.js
@@ -18,6 +18,11 @@ Ext.define("Workout.view.exercicios.Grid", {
       { text: "Excluir", handler: this.excluir, scope: this}
     ];
     this.callParent();
+    // this.store.on('datachanged', function(store) {
+    //   debugger;
+    //   store.rejectChanges()
+    //   //store.sync();
+    // });
   },
   store: Ext.createByAlias("store.exercicios")
 });
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,7 +10,7 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require ext-all
+//= require ext-all-dev
 //= require base
 //= require_tree ./app/view/dashboard
 //= require ./app/view/Viewport

diff --git a/app/assets/javascripts/base.js b/app/assets/javascripts/base.js
@@ -18,11 +18,16 @@ Ext.onReady(function(){
               message: exception[item]
           });
         }
-        if(operation.scope.getForm) {
+        if(operation.scope && operation.scope.getForm) {
           var form = operation.scope.getForm();
           var model = operation.scope.getForm().getRecord();
           if(model) model.errors = errors;
           operation.scope.getForm().markInvalid(errors);
+        } else {
+          var messages = errors.items.map(function(item, i){
+            return item.field + " <br/> " + item.message.map(function(msg, k){ return (i+1) + "." + (k+1) + ": " + msg  }) + "";
+          })
+          Ext.Msg.alert('Erro(s)', messages );
         }
       });
     }

diff --git a/app/models/exercicio.rb b/app/models/exercicio.rb
@@ -2,6 +2,16 @@ class Exercicio < ActiveRecord::Base
   attr_accessible :descricao, :titulo
 
   validates_presence_of :titulo, :descricao
-  validates_uniqueness_of :titulo  
+  validates_uniqueness_of :titulo
+
+  before_destroy :verificar_rotina
+
+  private
+  def verificar_rotina
+    empty = Item.where(:exercicio_id => self.id).empty?
+    msg = "Nao pode excluir esse exercicio porque ele participa de uma ou mais Rotinas"
+    self.errors[:base] << msg unless empty
+    empty
+  end
 
 end