RubyGems - erp_app - Versions diffs - 3.1.5 → 3.1.6 - Mend

erp_app 3.1.5 → 3.1.6

Files changed (119) hide show

data/app/controllers/erp_app/desktop/job_tracker/base_controller.rb CHANGED

@@ -15,7 +15,12 @@ module ErpApp
           render :json => {:total_count => total_count, :success => true,
                            :jobs => job_trackers.collect { |tracker| tracker.to_hash(
-                               :only => [:id, :job_name, :last_run_at, :next_run_at, :job_klass, :run_time], :additional_values => {:scheduled => (tracker.scheduled?)}) }}
+                               :only => [:id, :job_name, :job_klass, :run_time],
+                               :additional_values => {
+                                 :scheduled => (tracker.scheduled?),
+                                 :last_run_at => (tracker.last_run_at.nil? ? '' : tracker.last_run_at.strftime("%m-%d-%Y %H:%M:%S")),
+                                 :next_run_at => (tracker.next_run_at.nil? ? '' : tracker.next_run_at.strftime("%m-%d-%Y %H:%M:%S")),
+                                 }) }}
         end
         def schedule

data/app/controllers/erp_app/mobile/user_management/base_controller.rb CHANGED

@@ -2,9 +2,6 @@ module ErpApp
 	module Mobile
     module UserManagement
       class BaseController < ::ErpApp::Mobile::BaseController
-        def index
-          @application = MobileApplication.find_by_internal_identifier('user_management')
-        end
         def users
           users = User.all.collect do |user|

data/app/models/application.rb CHANGED

@@ -6,7 +6,7 @@ class Application < ActiveRecord::Base
   has_and_belongs_to_many :app_containers
   has_and_belongs_to_many :widgets
-  validates_uniqueness_of :javascript_class_name
+  validates_uniqueness_of :javascript_class_name, :allow_nil => true
   validates_uniqueness_of :internal_identifier, :scope => :type, :case_sensitive => false
   def locate_resources(resource_type)

data/app/views/erp_app/desktop/base/index.erb CHANGED

@@ -56,10 +56,10 @@
     <!--javascript-->
     <%= include_extjs(:theme => @desktop.get_preference(:extjs_theme), :debug => (Rails.env != 'production')) %>
     <%= static_javascript_include_tag("extjs/overrides.js")%>
     <%= static_javascript_include_tag("erp_app/utility.js")%>
     <%= static_javascript_include_tag("erp_app/desktop/ext_ux_desktop_module.js")%>
     <%= static_javascript_include_tag('erp_app/widgets.js')%>
     <%= include_widgets%>
     <!-- shared application resources -->
@@ -90,7 +90,7 @@
    <!-- end application resources -->
    <!-- compass extensions -->
    <%=include_code_mirror_library%>
-   <style type="text/css">
+   <style type="text/css">
           .CodeMirror {
             border: 1px solid #eee;
           }
@@ -155,7 +155,7 @@
                   iconCls:"icon-key",
                   handler:b.onLogout,
                   scope:b
-                },
+                },
                 {
                   text:"About",
                   iconCls:"icon-info",
@@ -199,7 +199,7 @@
                                        "<tr><td>{name}</td><td>{version}</td></tr>",
                                        '</tpl>',
                                        "</table>");
           var aboutWindow = Ext.create('Ext.window.Window',{
             title: 'About Your Compass AE Instance',
             height: 200,
@@ -221,7 +221,7 @@
       var compassDesktop;
       Ext.onReady(function () {
         compassDesktop = new MyDesktop.App();
         setTimeout(function(){
           Ext.get('loading').remove();
           Ext.get('loading-mask').fadeOut({remove:true});
@@ -231,6 +231,11 @@
         }, 250);
       });
+      window.onbeforeunload = function(){
+          return ' If you navigate away from this page without' +
+                  ' first saving your data, the changes will be' +
+                  ' lost.';
+      }
     </script>
     <div id="loading-mask"></div>
     <div id="loading">

data/app/views/erp_app/mobile/base/index.erb CHANGED

@@ -1,38 +1,43 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CompassAE Mobile</title>
-    <%=include_sencha_touch :debug => (Rails.env != 'production')%>
-    <%=static_javascript_include_tag('erp_app/utility.js')%>
-    <%=static_javascript_include_tag('erp_app/mobile/mobile_base.js')%>
-    <%#=setup_js_authentication(@user, @desktop)%>
-    <%=create_authenticity_token_sencha_touch_field%>
+<head>
+  <title>CompassAE Mobile</title>
+  <%= include_sencha_touch :debug => (Rails.env != 'production') %>
+  <%= static_javascript_include_tag('erp_app/utility.js') %>
+  <%= static_javascript_include_tag('erp_app/mobile/mobile_base.js') %>
+  <%= create_authenticity_token_sencha_touch_field %>
+  <%= add_authenticity_token_to_extjs %>
-    <!--stylesheets-->
-    <%= static_stylesheet_link_tag('erp_app/mobile/mobile.css') %>
-    <!--end stylesheets-->
+  <!--stylesheets-->
+  <%= static_stylesheet_link_tag('erp_app/mobile/mobile.css') %>
+  <!--end stylesheets-->
-    <script type="text/javascript">
-    var mobileApplications = [];
-    <%
-    @mobile.applications.each do |application|
-    %>
-    mobileApplications.push({
-      text:'<%=application.description%>',
-      iconCls:'<%=application.icon%>',
-      ui:'round',
-      handler:function(){
-        window.location = '<%=application.base_url%>'
-      }
-    });
-    <%
-    end
-    %>
-    </script>
+  <% @mobile.applications.each do |application| %>
+      <%= static_javascript_include_tag(application.locate_resources('javascripts')) %>
+      <%= static_stylesheet_link_tag(application.locate_resources('stylesheets')) %>
+  <% end %>
-    <%= static_javascript_include_tag("erp_app/mobile/app.js")%>
-  </head>
-  <body>
-    <%= setSessionTimeout %>
-  </body>
+  <script type="text/javascript">
+      var mobileApplications = [], mobileApplicationsData = [];
+      <%
+      @mobile.applications.each do |application|
+      %>
+      mobileApplications.push({xtype: '<%=application.xtype%>', itemId: '<%=application.internal_identifier%>'});
+      mobileApplicationsData.push({
+          iconCls: '<%=application.icon%>',
+          name: '<%=application.description%>',
+          itemId: '#<%=application.internal_identifier%>'
+      });
+      <%
+      end
+      %>
+  </script>
+  <%= static_javascript_include_tag("erp_app/mobile/app.js") %>
+</head>
+<body>
+<%= setSessionTimeout %>
+</body>
 </html>

data/app/views/erp_app/mobile/login/index.erb CHANGED

@@ -2,10 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>CompassAE Mobile</title>
-    <%=include_sencha_touch :debug => true%>
+    <%=include_sencha_touch :debug => (Rails.env != 'production') %>
     <%=static_javascript_include_tag('erp_app/utility.js')%>
     <%=static_javascript_include_tag('erp_app/mobile/mobile_base.js')%>
-    <%#=setup_js_authentication(@user, @desktop)%>
     <script type="text/javascript">
       Compass.ErpApp.Mobile.AuthentictyToken = '<%=form_authenticity_token%>';
       Compass.ErpApp.Mobile.LoginTo = '/erp_app/mobile/'

data/app/views/erp_app/organizer/base/index.erb CHANGED

@@ -40,6 +40,12 @@
           organizerLayout.setupLogoutButton();
           organizerLayout.setup();
       });
+      window.onbeforeunload = function(){
+          return ' If you navigate away from this page without' +
+                  ' first saving your data, the changes will be' +
+                  ' lost.';
+      }
     </script>
     <%= setSessionTimeout %>
   </body>

data/db/data_migrations/20120411180756_create_user_management_mobile_application.rb CHANGED

@@ -1,14 +1,12 @@
 class CreateUserManagementMobileApplication
   def self.up
-    app = MobileApplication.create(
-      :description => 'User Management',
-      :icon => 'icon-user',
-      :internal_identifier => 'user_management',
-      :base_url => '/erp_app/mobile/user_management/index'
+    MobileApplication.create(
+        :description => 'User Management',
+        :icon => 'icon-user',
+        :internal_identifier => 'user_management',
+        :xtype => 'compass-erpapp-mobile-usermanagement-application'
     )
-    app.save
   end
   def self.down

data/db/data_migrations/20130411200351_add_job_tracker_mobile_app.rb ADDED

@@ -0,0 +1,16 @@
+class AddJobTrackerMobileApp
+  def self.up
+    MobileApplication.create(
+        :description => 'Jobs',
+        :icon => 'icon-tasks',
+        :internal_identifier => 'job_tracker',
+        :xtype => 'compass-erpapp-mobile-jobtracker-application'
+    )
+  end
+  def self.down
+    MobileApplication.destroy_all("internal_identifier = 'job_tracker'")
+  end
+end

data/db/migrate/20120920145259_add_job_tracker.rb CHANGED

@@ -1,15 +1,19 @@
 class AddJobTracker < ActiveRecord::Migration
   def up
-    create_table :job_trackers do |t|
-      t.string :job_name
-      t.string :job_klass
-      t.string :run_time
-      t.datetime :last_run_at
-      t.datetime :next_run_at
+    unless table_exists?(:job_trackers)
+      create_table :job_trackers do |t|
+        t.string :job_name
+        t.string :job_klass
+        t.string :run_time
+        t.datetime :last_run_at
+        t.datetime :next_run_at
+      end
     end
   end
   def down
-    drop_table :job_trackers
+    if table_exists?(:job_trackers)
+      drop_table :job_trackers
+    end
   end
 end

data/db/migrate/20130410182333_update_mobile_application.rb ADDED

@@ -0,0 +1,27 @@
+class UpdateMobileApplication < ActiveRecord::Migration
+  def up
+    unless columns(:applications).collect { |c| c.name }.include?('xtype')
+      rename_column :applications, :base_url, :xtype
+      user_management = MobileApplication.find_by_internal_identifier('user_management')
+      if user_management.nil?
+        MobileApplication.create(
+            :description => 'User Mgmt',
+            :icon => 'icon-user',
+            :internal_identifier => 'user_management',
+            :xtype => 'compass-erpapp-mobile-usermanagement-application'
+        )
+      else
+        user_management.description = 'User Mgmt'
+        user_management.xtype = 'compass-erpapp-mobile-usermanagement-application'
+        user_management.save
+      end
+    end
+  end
+  def down
+    if columns(:applications).collect { |c| c.name }.include?('xtype')
+      rename_column :applications, :xtype, :base_url
+    end
+  end
+end

data/lib/erp_app/version.rb CHANGED

@@ -2,7 +2,7 @@ module ErpApp
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/generators/compass_ae_mobile/compass_ae_mobile_generator.rb CHANGED

@@ -10,14 +10,17 @@ class CompassAeMobileGenerator < Rails::Generators::NamedBase
     run "sencha -sdk #{@sdk_path} generate app #{class_name} #{application_path}"
     %w{app.json build.xml index.html packager.json resources}.each do |file|
-      remove_file(File.join(application_path, file))
+      remove_file File.join(application_path, file)
     end
     gsub_file File.join(application_path, 'app.js'), %r[^//<debug>([\s\S])+//</debug>], "Ext.Loader.setPath({'#{class_name}': 'javascripts/#{class_name}/app'});"
     #replace Main.js
-    remove_file remove_file(File.join(application_path, 'app', 'view', 'Main.js'))
+    remove_file File.join(application_path, 'app', 'view', 'Main.js')
     template "javascripts/main_template.erb", File.join(application_path, 'app', 'view', 'Main.js')
+    #remove touch library
+    remove_file File.join(application_path, 'touch')
   end
   def generate_compass_ae_files

data/lib/generators/mobile_application/mobile_application_generator.rb CHANGED

@@ -9,8 +9,6 @@ class MobileApplicationGenerator < Rails::Generators::NamedBase
     #make javascript
     template "public/app.js.erb", "public/javascripts/erp_app/mobile/applications/#{file_name}/app.js"
-    copy_file "views/index.html.erb", "app/views/erp_app/mobile/#{file_name}/base/index.html.erb"
     #make css folder
     empty_directory "public/stylesheets/erp_app/mobile/applications/#{file_name}"

data/lib/generators/mobile_application/templates/controllers/controller_template.erb CHANGED

@@ -4,7 +4,7 @@ module ErpApp
       class BaseController < ::ErpApp::Mobile::BaseController
         def index
-          @application = MobileApplication.find_by_internal_identifier('<%= file_name%>')
+          render :json => {:success => true, :message => 'Hello World'}
         end
       end #BaseController

data/lib/generators/mobile_application/templates/migrate/migration_template.erb CHANGED

@@ -1,10 +1,10 @@
 class Create<%=class_name %>MobileApplication
   def self.up
-    app = MobileApplication.create(
+    MobileApplication.create(
       :description => '<%=description %>',
       :icon => '<%=icon %>',
       :internal_identifier => '<%=file_name %>',
-      :base_url => '/erp_app/mobile/<%=file_name %>/index'
+      :xtype => 'compass-erpapp-mobile-<%= file_name %>-application'
     )
   end

data/lib/generators/mobile_application/templates/public/app.js.erb CHANGED

@@ -1,35 +1,24 @@
-Ext.ns('Compass.ErpApp.Mobile.<%=class_name %>');
-Ext.application({
-  name: '<%=class_name %>',
-  useLoadMask: true,
-  launch: function () {
-    Ext.create("Ext.Container", {
-      fullscreen: true,
-      html:'Your New Mobile Application',
-      items: [
-      {
-        xtype:'toolbar',
-        ui:'light',
-        docked:'top',
+Ext.define('Compass.ErpApp.Mobile.<%= class_name %>.Application', {
+    extend: 'Ext.Panel',
+    xtype: 'compass-erpapp-mobile-<%= file_name %>-application',
+    config:{
+        tabBarPosition: 'bottom',
         items:[
-        {
-          text:'Home',
-          ui:'back',
-          handler:function(btn){
-            window.location = '/erp_app/mobile';
-          }
-        },
-        {
-          text:'Logout',
-          ui:'round',
-          handler:function(btn){
-            window.location = '/session/sign_out?login_url=/erp_app/mobile/login';
-          }
-        }
-        ]
-      }
-      ]
-    });
-  }
-});
+            {
+                xtype: 'toolbar',
+                ui: 'light',
+                docked: 'top',
+                items: [
+                    {
+                        text: 'Home',
+                        ui: 'back',
+                        handler: function (btn) {
+                            btn.up('#mainContainer').setActiveItem('#home');
+                        }
+                    }
+                ]
+            }
+        ],
+        html:'Hello World'
+    }
+});

data/public/images/erp_app/mobile/green_light.png ADDED

Binary file

data/public/images/erp_app/mobile/red_light.png ADDED

Binary file

data/public/images/erp_app/mobile/yellow_light.png ADDED

Binary file

data/public/javascripts/erp_app/desktop/applications/job_tracker/jobs_grid.js CHANGED

@@ -5,8 +5,8 @@ Ext.define('Compass.ErpApp.Desktop.Applications.JobTracker.Model', {
         {name: 'job_name', type: 'string'},
         {name: 'run_time', type: 'string'},
         {name: 'scheduled', type: 'boolean'},
-        {name: 'last_run_at', type: 'date', dateFormat: 'c'},
-        {name: 'next_run_at', type: 'date', dateFormat: 'c'}
+        {name: 'last_run_at', type: 'date', dateFormat: 'm-d-Y H:i:s'},
+        {name: 'next_run_at', type: 'date', dateFormat: 'm-d-Y H:i:s'}
     ]
 });

data/public/javascripts/erp_app/login/mobile.js CHANGED

@@ -1,52 +1,59 @@
 Ext.application({
-  name: 'compass_ae_mobile_login',
-  useLoadMask: true,
+    name: 'compass_ae_mobile_login',
+    useLoadMask: true,
-  launch: function () {
-    Ext.create("Ext.form.Panel", {
-      fullscreen: true,
-      defaults:{
-        xtype:'textfield'
-      },
-      items: [
-      {
-        label:'Username or Email Address',
-        name:'login',
-        required:true
-      },
-      {
-        xtype:'passwordfield',
-        label:'Password',
-        name:'password',
-        required:true
-      },
-      {
-        xtype:'button',
-        text:'Login',
-        flex:1,
-        scope:this,
-        ui:'confirm-round',
-        style:'margin:0.1em',
-        handler:function(btn){
-          var form = btn.up('formpanel');
-          form.setMasked({
-            xtype:'loadmask',
-            message:'Authenticating User...'
-          });
-          form.submit({
-            url:'/session/sign_in',
-            method:'POST',
-            success:function(form, result){
-              form.setMasked(false);
-              window.location = Compass.ErpApp.Mobile.LoginTo;
+    launch: function () {
+        Ext.create("Ext.form.Panel", {
+            fullscreen: true,
+            defaults: {
+                xtype: 'textfield'
             },
-            failure:function(form, result){
-              Ext.Msg.alert("Error", "Could not authenticate .");
-            }
-          });
-        }
-      }
-      ]
-    });
-  }
+            items: [
+                {
+                    xtype:'container',
+                    height:200,
+                    cls: 'login-logo'
+                },
+                {
+                    label: 'Username or Email Address',
+                    labelAlign: 'top',
+                    name: 'login',
+                    required: true
+                },
+                {
+                    xtype: 'passwordfield',
+                    labelAlign: 'top',
+                    label: 'Password',
+                    name: 'password',
+                    required: true
+                },
+                {
+                    xtype: 'button',
+                    text: 'Login',
+                    flex: 1,
+                    scope: this,
+                    ui: 'confirm-round',
+                    style: 'margin:0.1em',
+                    handler: function (btn) {
+                        var form = btn.up('formpanel');
+                        form.setMasked({
+                            xtype: 'loadmask',
+                            message: 'Authenticating User...'
+                        });
+                        form.submit({
+                            url: '/session/sign_in',
+                            method: 'POST',
+                            success: function (form, result) {
+                                form.setMasked(false);
+                                window.location = Compass.ErpApp.Mobile.LoginTo;
+                            },
+                            failure: function (form, result) {
+                                Ext.Msg.alert("Error", "Could not authenticate .");
+                            }
+                        });
+                    }
+                }
+            ]
+        });
+    }
 });