Home Esplora Aiuto
Accedi
eirugit
/
odoo-mobile
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

opportunity module view fixed and login automatically ended

robert2206 8 anni fa
parent
127f30bec3
commit
5dfcc5b5f8
9 ha cambiato i file con 80 aggiunte e 15 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 2 1
      bower.json
  2. 22 0
      www/css/app.css
  3. 2 0
      www/index.html
  4. 41 10
      www/js/app.js
  5. 7 1
      www/js/controllers/configuration.controller.js
  6. 1 0
      www/js/controllers/lead.controller.js
  7. 3 1
      www/js/factories/utils.factory.js
  8. 1 1
      www/templates/sales/customers.html
  9. 1 1
      www/templates/sales/leads.html

+ 2 - 1
bower.json
Vedi File 

@@ -7,6 +7,7 @@
 
   "dependencies": {
 
     "angular-local-storage": "^0.2.7",
 
     "ngCordova": "^0.1.27-alpha",
 
-    "ionic-filter-bar": "^1.1.1"
 
+    "ionic-filter-bar": "^1.1.1",
 
+    "ionic-toast": "^0.4.1"
 
   }
 
 }

+ 22 - 0
www/css/app.css
Vedi File 

@@ -40,6 +40,18 @@
 
 
 .bar-icon {
 
     font-size:22px !important;
 
+    margin-right: 10px;
 
+    margin-left: 10px;
 
+}
 
+
 
+.holded {
 
+    background-color: lightgray;
 
+    /*box-shadow:
 
+                1px 1px #387ef5,
 
+                2px 2px #387ef5,
 
+                3px 3px #387ef5;
 
+        -webkit-transform: translateX(-3px);
 
+        transform: translateX(-3px);*/
 
 }
 
 
 .centered-spinner {
 
@@ -60,3 +72,13 @@
 
 .scroll {
 
     height:100%;
 
 }
 
+
 
+.slider{
 
+  height:100vh;
 
+  width:auto;
 
+}
 
+
 
+.slider-slide {
 
+  height: 100vh;
 
+  width: auto;
 
+}

+ 2 - 0
www/index.html
Vedi File 

@@ -45,7 +45,9 @@
 
     <script src="js/factories/sales/opportunity.sync.factory.js"></script>
 
 
     <!-- 3rd Party -->
 
+    <!-- JS -->
 
     <script src="lib/angular-xmlrpc/xmlrpc.js"></script>
 
+    <script src="lib/ionic-toast/dist/ionic-toast.bundle.min.js"></script>
 
   </head>
 
   <body ng-app="odoo">
 
       <ion-nav-view animation="slide-left-right"></ion-nav-view>

+ 41 - 10
www/js/app.js
Vedi File 

@@ -1,6 +1,20 @@
 
-angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar'])
 
+angular.module(
 
+    'odoo',
 
+    [
 
+        'ionic',
 
+        'ngCordova',
 
+        'xml-rpc',
 
+        'jett.ionic.filter.bar',
 
+        'ionic-toast'
 
+    ]
 
+)
 
 
-.run(function($ionicPlatform) {
 
+.run(function(
 
+    $ionicPlatform,
 
+    $state,
 
+    configFactory
 
+) {
 
+    
      $ionicPlatform.ready(function() {
 
         if (window.cordova && window.cordova.plugins.Keyboard) {
 
             cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
 
@@ -72,10 +86,25 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
                       'type' VARCHAR(20) DEFAULT NULL,\n\
 
                       'user_id' INTEGER DEFAULT 0,\n\
 
                       'partner_id' INTEGER DEFAULT 0);");
 
+
 
+        configFactory(function (configuration) {
 
+            if (configuration) {
 
+                $state.go('app.main');
 
+            } else {
 
+                $state.go('configuration');
 
+            }
 
+        }, function (err) {
 
+            $state.go('configuration');
 
+        });
 
     });
 
 })
 
 
-.config(function ($stateProvider, $urlRouterProvider, $ionicConfigProvider, $ionicFilterBarConfigProvider) {
 
+.config(function (
 
+    $stateProvider,
 
+    $urlRouterProvider,
 
+    // $ionicConfigProvider,
 
+    $ionicFilterBarConfigProvider
 
+) {
 
 
     $stateProvider
 
         .state('app', {
 
@@ -83,8 +112,9 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
             abstract: true,
 
             templateUrl: 'templates/menu.html'
 
         })
 
+
 
         .state('app.main', {
 
-            url: 'app/main',
 
+            url: '/main',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/main.html',
 
@@ -94,7 +124,7 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
         })
 
 
         .state('app.sales', {
 
-            url: 'app/sales',
 
+            url: '/sales',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/sales/sales.html',
 
@@ -104,7 +134,7 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
         })
 
 
         .state('app.customers', {
 
-            url: 'app/customers',
 
+            url: '/customers',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/sales/customers.html',
 
@@ -114,7 +144,7 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
         })
 
 
         .state('app.leads', {
 
-            url: 'app/leads',
 
+            url: '/leads',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/sales/leads.html',
 
@@ -124,7 +154,7 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
         })
 
 
         .state('app.opportunities', {
 
-            url: 'app/opportunities',
 
+            url: '/opportunities',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/sales/opportunities.html',
 
@@ -134,7 +164,7 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
         })
 
 
         .state('app.preferences', {
 
-            url: 'app/preferences',
 
+            url: '/preferences',
 
             views: {
 
                 'content': {
 
                     templateUrl: 'templates/preferences.html',
 
@@ -149,9 +179,10 @@ angular.module('odoo',['ionic', 'ngCordova', 'xml-rpc', 'jett.ionic.filter.bar']
 
             controller: 'ConfigurationController'
 
         });
 
 
-    $urlRouterProvider.otherwise('/configuration');
 
+    // $urlRouterProvider.otherwise('/configuration');
 
 
     // $ionicConfigProvider.tabs.position('bottom');
 
+    // $ionicConfigProvider.backButton.icon('ion-chevron-left');
 
 
     $ionicFilterBarConfigProvider.theme('positive');
 
     $ionicFilterBarConfigProvider.placeholder('Buscar');

+ 7 - 1
www/js/controllers/configuration.controller.js
Vedi File 

@@ -9,7 +9,13 @@ angular.module('odoo')
 
     odooInteroperabilityFactory,
 
     sqlFactory
 
 ) {
 
-    $scope.config = { host: '192.168.43.170', port: 8069, database: 'odoo', username: 'admin', password: 'admin' }
 
+
 
+    // $scope.config = { host: 'localhost', port: 8069, database: 'odoo', username: 'admin', password: 'admin' };
 
+    $scope.config = { host: '192.168.2.106', port: 8069, database: 'odoo', username: 'admin', password: 'admin' };
 
+
 
+    $scope.$on('ionicView.enter', function () {
 
+        console.log('Evaluar usuario');
 
+    });
 
 
     // Apply configuration for app
 
     $scope.configure = function () {

+ 1 - 0
www/js/controllers/lead.controller.js
Vedi File 

@@ -11,6 +11,7 @@ angular.module('odoo')
 
     opportunitiesStorageFactory,
 
     sqlFactory
 
 ) {
 
+
 
     $scope.loading = false;
 
     $scope.leads = [];
 
     $scope.lead = {};

+ 3 - 1
www/js/factories/utils.factory.js
Vedi File 

@@ -54,7 +54,9 @@ angular.module('odoo')
 
 .factory('configFactory', function (sqlFactory) {
 
     return function (success, error) {
 
         sqlFactory.select('user', function (users) {
 
-            if (users.length == 1) {
 
+            if (users.length == 0) {
 
+                success(0);
 
+            } else if (users.length == 1) {
 
                 success(users.item(0));
 
             } else {
 
                 var configs = [];

File diff suppressed because it is too large
+ 1 - 1
www/templates/sales/customers.html


+ 1 - 1
www/templates/sales/leads.html
Vedi File 

@@ -10,7 +10,7 @@
 
         <ion-refresher pulling-text="Actualizar" on-refresh="fill(true)" spinner="lines"></ion-refresher>
 
         <ion-spinner class="centered-spinner" ng-show="loading" icon="lines"></ion-spinner>
 
 
-        <ion-list>
 
+        <ion-list type="card">
 
           <ion-item assertive on-hold="openOptions($index)" ng-repeat="l in leads">
 
               <h2><strong>{{ l.name }}</strong></h2>
 
               <p><strong>Contacto:</strong>{{ l.contact_name }}</p>

Some files were not shown because too many files changed in this diff