- Modal: allow to give additionnal options

- ES:  Fix plugin injection
- ES: fix registry record edition
- ES : code refactoring for pictures edition

www/i18n/locale-en.json

@@ -26,8 +26,6 @@
     "TO": "To",
     "COPY": "Copy",
     "LANGUAGE": "Language",
-    "BTN_PICTURE_DELETE": "Delete",
-    "BTN_PICTURE_FAVORISE": "Default",
     "UNIVERSAL_DIVIDEND": "Universal dividend",
     "UD": "UD",
     "DATE_PATTERN": "YYYY-MM-DD HH:mm",

www/i18n/locale-fr-FR.json

@@ -26,8 +26,6 @@
     "TO": "A",
     "COPY": "Copier",
     "LANGUAGE": "Langue",
-    "BTN_PICTURE_DELETE": "Supprimer",
-    "BTN_PICTURE_FAVORISE": "Principale",
     "UNIVERSAL_DIVIDEND": "Dividende universel",
     "UD": "DU",
     "DATE_PATTERN": "DD/MM/YYYY HH:mm",

www/index.html

@@ -92,6 +92,7 @@
       <script src="dist/dist_js/plugins/es/js/services/market-services.js"></script>
       <script src="dist/dist_js/plugins/es/js/services/registry-services.js"></script>
       <script src="dist/dist_js/plugins/es/js/services/user-services.js"></script>
+      <script src="dist/dist_js/plugins/es/js/controllers/common-controllers.js"></script>
       <script src="dist/dist_js/plugins/es/js/controllers/market-controllers.js"></script>
       <script src="dist/dist_js/plugins/es/js/controllers/registry-controllers.js"></script>
       <script src="dist/dist_js/plugins/es/js/controllers/user-controllers.js"></script>

www/js/app.js

@@ -235,7 +235,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngAnimate',
     };
   })
 
-.run(function($rootScope, amMoment, $translate, Device, UIUtils, $ionicConfig
+.run(function($rootScope, amMoment, $translate, Device, UIUtils, $ionicConfig, PluginService
 ) {
   'ngInject';
 
@@ -278,5 +278,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngAnimate',
   // Set up moment translation
   $rootScope.$on('$translateChangeSuccess', $rootScope.onLanguageChange);
 
+  // start plugin
+  PluginService.start();
 })
 ;

www/js/controllers/app-controllers.js

@@ -155,10 +155,6 @@ function AppController($scope, $rootScope, $ionicModal, $state, $ionicSideMenuDe
   $scope.config = APP_CONFIG;
   $rootScope.walletData = Wallet.data;
 
-  //LoginModalController.call(this, $scope, $rootScope, $ionicModal, Wallet, CryptoUtils, UIUtils, $q, $state, $timeout, $ionicSideMenuDelegate, $ionicHistory);
-
-  //TransferModalController.call(this, $scope, $rootScope, $ionicModal, $state, BMA, Wallet, UIUtils, $timeout, Device, $ionicPopover, $translate, $filter, $q);
-
   ////////////////////////////////////////
   // Load currencies
   ////////////////////////////////////////

www/js/controllers/wallet-controllers.js

 
-angular.module('cesium.wallet.controllers', ['cesium.services', 'cesium.currency.controllers', 'cesium.user.services'])
+angular.module('cesium.wallet.controllers', ['cesium.services', 'cesium.currency.controllers'])
 
   .config(function($stateProvider, $urlRouterProvider) {
     'ngInject';
@@ -33,7 +33,7 @@ angular.module('cesium.wallet.controllers', ['cesium.services', 'cesium.currency
 ;
 
 function WalletController($scope, $rootScope, $state, $q, $ionicPopup, $ionicActionSheet, $timeout,
-  UIUtils, Wallet, BMA, $translate, Device, $ionicPopover, Modals, UserService) {
+  UIUtils, Wallet, BMA, $translate, Device, $ionicPopover, Modals) {
   'ngInject';
 
   $scope.walletData = null;

www/js/controllers/wot-controllers.js

@@ -49,7 +49,7 @@ angular.module('cesium.wot.controllers', ['cesium.services'])
   .controller('WotCertificationsViewCtrl', WotCertificationsViewController)
 ;
 
-function WotLookupController($scope, BMA, $state, UIUtils, $timeout, Device, Wallet, IdentityService, UserService) {
+function WotLookupController($scope, BMA, $state, UIUtils, $timeout, Device, Wallet, IdentityService) {
   'ngInject';
 
   $scope.search = {
@@ -149,7 +149,7 @@ function WotLookupModalController($scope, BMA, $state, UIUtils, $timeout, Device
 
 }
 
-function WotIdentityViewController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout, Device, UserService) {
+function WotIdentityViewController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout, Device) {
   'ngInject';
 
   $scope.identity = {};

www/js/plugins.js

@@ -9,8 +9,9 @@ angular.module('cesium.plugins', [
     'cesium.market.services',
     'cesium.user.services',
     // Controllers
-    'cesium.registry.controllers',
+    'cesium.es.controllers',
     'cesium.market.controllers',
+    'cesium.registry.controllers',
     'cesium.user.controllers'
   ])
 ;

www/js/services/identity-services.js

@@ -7,7 +7,7 @@ angular.module('cesium.identity.services', ['ngResource', 'ngApi', 'cesium.bma.s
   IdentityService = function(id) {
 
     var
-    api = new Api(this, id),
+    api = new Api(this, "IdentityService-" + id),
 
     loadRequirements = function(pubkey) {
       return $q(function(resolve, reject) {

www/js/services/modal-services.js

@@ -4,7 +4,7 @@ angular.module('cesium.modal.services', [])
   'ngInject';
 
 
-  function show(templateUrl, controller, parameters) {
+  function show(templateUrl, controller, parameters, options) {
     // Grab the injector and create a new scope
     var deferred = $q.defer(),
         ctrlInstance,
@@ -20,10 +20,11 @@ angular.module('cesium.modal.services', [])
       }
     };
 
-    $ionicModal.fromTemplateUrl(templateUrl, {
-      scope: modalScope,
-      animation: 'slide-in-up'
-    })
+    options = options ? options : {} ;
+    options.scope = options.scope ? options.scope : modalScope;
+    options.animation = options.animation ? options.animation : 'slide-in-up';
+
+    $ionicModal.fromTemplateUrl(templateUrl, options)
     .then(function (modal) {
       modalScope.modal = modal;
 

www/js/services/plugin-services.js

@@ -2,6 +2,31 @@
 
 angular.module('cesium.plugin.services', [])
 
+.provider('PluginService', function PluginServiceProvider() {
+  'ngInject';
+
+  var eagerLoadingServices = [];
+
+  this.registerEagerLoadingService = function(serviceName) {
+    eagerLoadingServices.push(serviceName);
+  };
+
+  this.$get = ['$injector', function pluginFactory($injector) {
+
+    function start() {
+      if (eagerLoadingServices.length>0) {
+        _.forEach(eagerLoadingServices, function(name) {
+          $injector.get(name);
+        });
+      }
+    }
+
+    return {
+      start: start
+    };
+  }];
+})
+
 .provider('$menu', function MenuProvider() {
   'ngInject';
 

www/js/services/wallet-services.js

@@ -53,7 +53,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
         }
     },
 
-    api = new Api(this, id),
+    api = new Api(this, 'WalletService-' + id),
 
     resetData = function() {
       data.pubkey= null;

www/plugins/es/i18n/locale-en.json

 {
+  "COMMON": {
+    "CATEGORY": "Category",
+    "CATEGORIES": "Categories",
+    "CATEGORY_SEARCH_HELP": "Search",
+    "LAST_MODIFICATION_DATE": "Updated on ",
+    "BTN_PUBLISH": "Publish",
+    "BTN_PICTURE_DELETE": "Delete",
+    "BTN_PICTURE_FAVORISE": "Default",
+    "BTN_ADD_PICTURES": "Add pictures"
+  },
   "MENU": {
     "MARKET": "Ads",
     "REGISTRY": "Companies",
@@ -6,15 +16,11 @@
   },
   "MARKET": {
     "COMMON": {
-      "CATEGORY": "Category",
-      "CATEGORY_SEARCH_HELP": "What: car, computer, ...",
-      "CATEGORIES": "Categories",
       "ISSUER": "Issuer",
       "PRICE": "Price",
       "BTN_BUY": "Buy",
       "BTN_NEW_AD": "New ad",
-      "COMMENTS": "Comments",
-      "SEARCH_CATEGORY_HELP": "Search"
+      "COMMENTS": "Comments"
     },
     "SEARCH": {
       "TITLE": "Market",
@@ -35,7 +41,6 @@
     },
     "EDIT": {
       "TITLE": "Edit",
-      "LAST_MODIFICATION_DATE": "Updated on ",
       "RECORD_TITLE": "Title",
       "RECORD_TITLE_HELP": "Title",
       "RECORD_DESCRIPTION": "Description",
@@ -44,11 +49,7 @@
       "RECORD_LOCATION_HELP": "Address, City",
       "RECORD_PRICE": "Price",
       "RECORD_PRICE_HELP": "Price (optional)",
-      "RECORD_CURRENCY": "Currency",
-      "BTN_ADD_PICTURES": "Add pictures",
-      "BTN_ADD_PICTURE": "Add a picture",
-      "BTN_PUBLISH": "Publish",
-      "BTN_SAVE": "Save"
+      "RECORD_CURRENCY": "Currency"
     },
     "ERROR": {
       "LOAD_CATEGORY_FAILED": "Error while loading market categories",
@@ -60,8 +61,6 @@
   "REGISTRY": {
     "COMMON": {
       "CATEGORY": "Category",
-      "CATEGORY_SEARCH_HELP": "What: restaurant, ...",
-      "CATEGORIES": "Categories",
       "ISSUER": "Issuer",
       "BTN_NEW": "Add"
     },
@@ -95,10 +94,7 @@
       "RECORD_LOCATION": "Localization",
       "RECORD_LOCATION_HELP": "Localization (address, city)",
       "RECORD_SOCIAL_NETWORKS": "Social networks",
-      "RECORD_PUBKEY": "Public key",
-      "BTN_ADD_PICTURES": "Add pictures",
-      "BTN_PUBLISH": "Publish",
-      "BTN_SAVE": "Save"
+      "RECORD_PUBKEY": "Public key"
     },
     "ERROR": {
       "LOAD_RECORD_FAILED": "Loading failed",

www/plugins/es/i18n/locale-fr-FR.json

 {
   "COMMON": {
+    "CATEGORY": "Catégorie",
     "CATEGORIES": "Catégories",
-    "CATEGORY_SEARCH_HELP": "Recherche"
+    "CATEGORY_SEARCH_HELP": "Recherche",
+    "LAST_MODIFICATION_DATE": "Mise à jour le",
+    "BTN_PUBLISH": "Publier",
+    "BTN_PICTURE_DELETE": "Supprimer",
+    "BTN_PICTURE_FAVORISE": "Principale",
+    "BTN_ADD_PICTURE": "Ajouter une photo"
   },
   "MENU": {
     "MARKET": "Annonces",
@@ -10,7 +16,6 @@
   },
   "MARKET": {
     "COMMON": {
-      "CATEGORY": "Catégorie",
       "ISSUER": "Soumis par",
       "PRICE": "Prix",
       "BTN_BUY": "Acheter",
@@ -36,7 +41,6 @@
     },
     "EDIT": {
       "TITLE": "Edition",
-      "LAST_MODIFICATION_DATE": "Mise à jour le",
       "RECORD_TITLE": "Titre",
       "RECORD_TITLE_HELP": "Titre",
       "RECORD_DESCRIPTION": "Description",
@@ -45,11 +49,7 @@
       "RECORD_LOCATION_HELP": "Adresse, Ville",
       "RECORD_PRICE": "Prix",
       "RECORD_PRICE_HELP": "Prix (optionnel)",
-      "RECORD_CURRENCY": "Monnaie",
-      "BTN_ADD_PICTURES": "Ajouter des photos",
-      "BTN_ADD_PICTURE": "Ajouter une photo",
-      "BTN_PUBLISH": "Publier",
-      "BTN_SAVE": "Sauvegarder"
+      "RECORD_CURRENCY": "Monnaie"
     },
     "ERROR": {
       "LOAD_CATEGORY_FAILED": "Erreur d'initialisation des catégories",
@@ -94,10 +94,7 @@
       "RECORD_LOCATION": "Localisation",
       "RECORD_LOCATION_HELP": "Localisation (adresse, ville)",
       "RECORD_SOCIAL_NETWORKS": "Réseaux sociaux",
-      "RECORD_PUBKEY": "Clé publique",
-      "BTN_ADD_PICTURES": "Ajouter des photos",
-      "BTN_PUBLISH": "Publier",
-      "BTN_SAVE": "Sauvegarder"
+      "RECORD_PUBKEY": "Clé publique"
     },
     "ERROR": {
       "LOAD_RECORD_FAILED": "Chargement impossible",

www/plugins/es/js/controllers/common-controllers.js

+angular.module('cesium.es.controllers', ['cesium.services', 'ngSanitize'])
+
+ .controller('ESPicturesEditCtrl', ESPicturesEditController)
+
+ .controller('ESCategoryModalCtrl', ESCategoryModalController)
+
+ .controller('ESEmptyModalCtrl', ESEmptyModalController)
+
+;
+
+
+function ESPicturesEditController($scope, $ionicModal, Wallet, Market, UIUtils, $state, CryptoUtils, $q, $ionicPopup, Device, $timeout, ModalUtils) {
+  'ngInject';
+
+  $scope.selectNewPicture = function() {
+    if ($scope.isDeviceEnable()){
+      openPicturePopup();
+    }
+    else {
+      var fileInput = angular.element(document.querySelector('#editMarket #pictureFile'));
+      if (fileInput && fileInput.length > 0) {
+        fileInput[0].click();
+      }
+    }
+  };
+
+  $scope.openPicturePopup = function() {
+    Device.camera.getPicture()
+    .then(function(imageData) {
+      $scope.pictures.push({src: "data:image/png;base64," + imageData});
+      $scope.$apply();
+    })
+    .catch(UIUtils.onError('ERROR.TAKE_PICTURE_FAILED'));
+  };
+
+  $scope.fileChanged = function(event) {
+    UIUtils.loading.show();
+    return $q(function(resolve, reject) {
+      var file = event.target.files[0];
+      UIUtils.image.resizeFile(file)
+      .then(function(imageData) {
+        $scope.pictures.push({src: imageData});
+        UIUtils.loading.hide();
+        //$scope.$apply();
+        resolve();
+      });
+    });
+  };
+
+  $scope.removePicture = function(index){
+    $scope.pictures.splice(index, 1);
+  };
+
+  $scope.favoritePicture = function(index){
+    if (index > 0) {
+      var item = $scope.pictures[index];
+      $scope.pictures.splice(index, 1);
+      $scope.pictures.splice(0, 0, item);
+    }
+  };
+}
+
+
+function ESCategoryModalController($scope, UIUtils, $timeout, parameters) {
+  'ngInject';
+
+  $scope.loading = true;
+  $scope.allCategories = [];
+  $scope.categories = [];
+  this.searchText = '';
+
+  $scope.afterLoad = function(result) {
+    $scope.categories = result;
+    $scope.allCategories = result;
+    $scope.loading = false;
+    $timeout(function() {
+      UIUtils.ink();
+    }, 10);
+  }
+
+  this.doSearch = function() {
+    var searchText = this.searchText.toLowerCase().trim();
+    if (searchText.length > 1) {
+      $scope.loading = true;
+      $scope.categories = $scope.allCategories.reduce(function(result, cat) {
+        if (cat.parent && cat.name.toLowerCase().search(searchText) != -1) {
+            return result.concat(cat);
+        }
+        return result;
+      }, []);
+
+      $scope.loading = false;
+    }
+    else {
+      $scope.categories = $scope.allCategories;
+    }
+  };
+
+  // load categories
+  if (parameters && parameters.categories) {
+    $scope.afterLoad(parameters.categories);
+  }
+  else if (parameters && parameters.load) {
+    parameters.load()
+    .then(function(res){
+      $scope.afterLoad(res);
+    })
+  }
+
+}
+
+
+function ESEmptyModalController($scope, parameters) {
+
+}

www/plugins/es/js/controllers/market-controllers.js

-angular.module('cesium.market.controllers', ['cesium.services', 'ngSanitize'])
+angular.module('cesium.market.controllers', ['cesium.services', 'ngSanitize', 'cesium.es.controllers'])
 
   .config(function($menuProvider) {
     'ngInject';
@@ -26,7 +26,7 @@ angular.module('cesium.market.controllers', ['cesium.services', 'ngSanitize'])
     })
 
    .state('app.market_view_record', {
-      url: "/market/:id/:title",
+      url: "/market/view/:id/:title",
       views: {
         'menuContent': {
           templateUrl: "plugins/es/templates/market/view_record.html",
@@ -48,7 +48,7 @@ angular.module('cesium.market.controllers', ['cesium.services', 'ngSanitize'])
 
     .state('app.market_edit_record', {
       cache: false,
-      url: "/market/:id/edit",
+      url: "/market/edit/:id/:title",
       views: {
         'menuContent': {
           templateUrl: "plugins/es/templates/market/edit_record.html",
@@ -64,11 +64,9 @@ angular.module('cesium.market.controllers', ['cesium.services', 'ngSanitize'])
 
  .controller('MarketRecordEditCtrl', MarketRecordEditController)
 
- .controller('MarketCategoryModalCtrl', MarketCategoryModalController)
-
 ;
 
-function MarketLookupController($scope, Market, $state, $ionicModal, $focus, $timeout, UIUtils, ModalUtils) {
+function MarketLookupController($scope, Market, $state, $ionicModal, $focus, $timeout, UIUtils, ModalUtils, $filter) {
   'ngInject';
 
   $scope.search = {
@@ -212,7 +210,7 @@ function MarketLookupController($scope, Market, $state, $ionicModal, $focus, $ti
                   var record = hit._source;
                   record.id = hit._id;
                   record.type = hit._type;
-                  record.urlTitle = record.title;
+                  record.urlTitle = $filter('formatSlug')(record.title);
                   if (record.category && record.category.id) {
                     record.category = categories[record.category.id];
                   }
@@ -260,9 +258,15 @@ function MarketLookupController($scope, Market, $state, $ionicModal, $focus, $ti
 
   /* -- modals -- */
 
-  $scope.showCategoryModal = function(parameters) {
-    ModalUtils.show('plugins/es/templates/modal_category.html', 'MarketCategoryModalCtrl as ctrl',
-          parameters, {focusFirstInput: true})
+  $scope.showCategoryModal = function() {
+    // load categories
+    Market.category.all()
+    .then(function(result){
+      return ModalUtils.show('plugins/es/templates/common/modal_category.html', 'ESCategoryModalCtrl as ctrl',
+        {categories : result},
+        {focusFirstInput: true}
+      )
+    })
     .then(function(cat){
       if (cat && cat.parent) {
         $scope.search.category = cat;
@@ -273,7 +277,7 @@ function MarketLookupController($scope, Market, $state, $ionicModal, $focus, $ti
 
 }
 
-function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Market, UIUtils, $state, CryptoUtils, $q, $timeout, BMA, UserService) {
+function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Market, UIUtils, $state, CryptoUtils, $q, $timeout, BMA, UserService, ESUtils, $filter) {
   'ngInject';
 
   $scope.formData = {};
@@ -409,7 +413,7 @@ function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Mar
   $scope.$watch('$root.walletData.settings.useRelative', $scope.refreshConvertedPrice, true);
 
   $scope.edit = function() {
-    $state.go('app.market_edit_record', {id: $scope.id});
+    $state.go('app.market_edit_record', {id: $scope.id, title: $filter('formatSlug')($scope.formData.title)});
   };
 
   $scope.showMoreComments = function(){
@@ -440,12 +444,9 @@ function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Mar
         obj.uid = walletData.uid;
       }
       obj.isnew = true;
-      $scope.comments.push(obj);
-      $scope.commentData = {}; // reset comment
       // Create
       if (!comment.id) {
-        // Set time (UTC) - TODO : use the block chain time
-        comment.time = Math.floor(moment().utc().valueOf() / 1000);
+        comment.time = ESUtils.date.now();
         obj.time = comment.time;
         Market.record.comment.add(comment)
         .then(function (id){
@@ -458,6 +459,9 @@ function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Mar
         Market.record.comment.update(comment, {id: comment.id})
         .catch(UIUtils.onError('MARKET.ERROR.FAILED_SAVE_COMMENT'));
       }
+
+      $scope.comments.push(obj);
+      $scope.commentData = {}; // reset comment
     });
   };
 
@@ -476,11 +480,9 @@ function MarketRecordViewController($scope, $rootScope, $ionicModal, Wallet, Mar
   };
 }
 
-function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils, $state, CryptoUtils, $q, $ionicPopup, Device, $timeout, ModalUtils) {
+function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils, $state, CryptoUtils, $q, $ionicPopup, Device, $timeout, ModalUtils, ESUtils) {
   'ngInject';
 
-  //MarketCategoryModalController.call(this, $scope, Market, $state, $ionicModal, UIUtils, Wallet);
-
   $scope.walletData = {};
   $scope.formData = {};
   $scope.id = null;
@@ -550,9 +552,7 @@ function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils
     return $q(function(resolve, reject) {
       var doFinishSave = function(formData) {
         if (!$scope.id) { // Create
-          // Set time (UTC)
-          // TODO : use the block chain time
-          formData.time = Math.floor(moment().utc().valueOf() / 1000);
+          formData.time = ESUtils.date.now();
           Market.record.add(formData)
           .then(function(id) {
             $scope.id = id;
@@ -564,9 +564,7 @@ function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils
         }
         else { // Update
           if (formData.time) {
-            // Set time (UTC)
-            // TODO : use the block chain time
-            formData.time = Math.floor(moment().utc().valueOf() / 1000);
+            formData.time = ESUtils.date.now();
           }
           Market.record.update(formData, {id: $scope.id})
           .then(function() {
@@ -656,9 +654,15 @@ function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils
 
   /* -- modals -- */
 
-  $scope.showCategoryModal = function(parameters) {
-    ModalUtils.show('plugins/es/templates/modal_category.html', 'MarketCategoryModalCtrl as ctrl',
-          parameters, {focusFirstInput: true})
+  $scope.showCategoryModal = function() {
+    // load categories
+    Market.category.all()
+    .then(function(result){
+      return ModalUtils.show('plugins/es/templates/common/modal_category.html', 'ESCategoryModalCtrl as ctrl',
+        {categories : result},
+        {focusFirstInput: true}
+      )
+    })
     .then(function(cat){
       if (cat && cat.parent) {
         $scope.category = cat;
@@ -667,40 +671,3 @@ function MarketRecordEditController($scope, $ionicModal, Wallet, Market, UIUtils
     });
   };
 }
-
-
-function MarketCategoryModalController($scope, Market, UIUtils, parameters) {
-  'ngInject';
-
-  $scope.loading = true;
-  $scope.allCategories = [];
-  $scope.categories = [];
-  this.searchText = '';
-
-  // load categories
-  Market.category.all()
-  .then(function(result){
-    $scope.categories = result;
-    $scope.allCategories = result;
-    $scope.loading = false;
-    UIUtils.ink();
-  });
-
-  this.doSearch = function() {
-    var searchText = this.searchText.toLowerCase().trim();
-    if (searchText.length > 1) {
-      $scope.loading = true;
-      $scope.categories = $scope.allCategories.reduce(function(result, cat) {
-        if (cat.parent && cat.name.toLowerCase().search(searchText) != -1) {
-            return result.concat(cat);
-        }
-        return result;
-      }, []);
-
-      $scope.loading = false;
-    }
-    else {
-      $scope.categories = $scope.allCategories;
-    }
-  };
-}

www/plugins/es/js/controllers/registry-controllers.js

-angular.module('cesium.registry.controllers', ['cesium.services', 'ngSanitize'])
+angular.module('cesium.registry.controllers', ['cesium.services', 'ngSanitize', 'cesium.es.controllers'])
 
   .config(function($menuProvider) {
     'ngInject';
@@ -65,10 +65,6 @@ angular.module('cesium.registry.controllers', ['cesium.services', 'ngSanitize'])
 
  .controller('RegistryRecordEditCtrl', RegistryRecordEditController)
 
- .controller('RegistryCategoryModalCtrl', RegistryCategoryModalController)
-
- .controller('RegistryRecordTypeModalCtrl', RegistryRecordTypeModalController)
-
 ;
 
 function RegistryLookupController($scope, $state, $ionicModal, $focus, $q, $timeout, Registry, UIUtils, $sanitize, ModalUtils, UserService) {
@@ -240,8 +236,13 @@ function RegistryLookupController($scope, $state, $ionicModal, $focus, $q, $time
   /* -- modals -- */
 
   $scope.showCategoryModal = function(parameters) {
-    ModalUtils.show('plugins/es/templates/modal_category.html', 'RegistryCategoryModalCtrl as ctrl',
-          parameters, {focusFirstInput: true})
+    // load categories
+    Registry.category.all()
+    .then(function(result){
+      // open modal
+      return ModalUtils.show('plugins/es/templates/common/modal_category.html', 'ESCategoryModalCtrl as ctrl',
+             {categories: result}, {focusFirstInput: true})
+    })
     .then(function(cat){
       if (cat && cat.parent) {
         $scope.search.category = cat;
@@ -255,7 +256,7 @@ function RegistryLookupController($scope, $state, $ionicModal, $focus, $q, $time
       .then(function(walletData) {
         UIUtils.loading.hide();
         $scope.walletData = walletData;
-        ModalUtils.show('plugins/es/templates/registry/modal_record_type.html', 'RegistryRecordTypeModalCtrl',
+        ModalUtils.show('plugins/es/templates/registry/modal_record_type.html', 'ESEmptyModalCtrl',
                   null, {focusFirstInput: true, animation: 'slide-in-down'})
         .then(function(type){
           if (type) {
@@ -397,7 +398,7 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
   'ngInject';
 
   $scope.walletData = {};
-  $scope.recordData = {};
+  $scope.formData = {};
   $scope.recordForm = {};
   $scope.type = null;
   $scope.id = null;
@@ -405,7 +406,7 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
   $scope.category = {};
   $scope.pictures = [];
 
-  $scope.setRecordForm =  function(recordForm) {
+  $scope.setForm =  function(recordForm) {
     $scope.recordForm = recordForm;
   };
 
@@ -429,7 +430,7 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
       .then(function(categories) {
         Registry.record.get({id: id})
         .then(function (hit) {
-          $scope.recordData = hit._source;
+          $scope.formData = hit._source;
           if (hit._source.category && hit._source.category.id){
             $scope.category = categories[hit._source.category.id];
           }
@@ -449,11 +450,11 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
   $scope.save = function() {
     UIUtils.loading.show();
     return $q(function(resolve, reject) {
-      $scope.recordData.pictures = $scope.pictures.reduce(function(res, pic) {
+      $scope.formData.pictures = $scope.pictures.reduce(function(res, pic) {
         return res.concat({src: pic.src});
       }, []);
       if (!$scope.id) { // Create
-          Registry.record.add($scope.recordData)
+          Registry.record.add($scope.formData)
           .then(function(id) {
             UIUtils.loading.hide();
             $state.go('app.registry_view_record', {id: id});
@@ -462,7 +463,7 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
           .catch(UIUtils.onError('REGISTRY.ERROR.SAVE_RECORD_FAILED'));
       }
       else { // Update
-          Registry.record.update($scope.recordData, {id: $scope.id})
+          Registry.record.update($scope.formData, {id: $scope.id})
           .then(function() {
             UIUtils.loading.hide();
             $state.go('app.registry_view_record', {id: $scope.id});
@@ -514,54 +515,18 @@ function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIU
 
   /* -- modals -- */
   $scope.showCategoryModal = function(parameters) {
-    ModalUtils.show('plugins/es/templates/modal_category.html', 'RegistryCategoryModalCtrl as ctrl',
-          parameters, {focusFirstInput: true})
+    // load categories
+    Registry.category.all()
+    .then(function(result){
+      // open modal
+      return ModalUtils.show('plugins/es/templates/common/modal_category.html', 'ESCategoryModalCtrl as ctrl',
+             {categories: result}, {focusFirstInput: true})
+    })
     .then(function(cat){
       if (cat && cat.parent) {
         $scope.category = cat;
-        $scope.recordData.category= cat.id;
+        $scope.formData.category= cat.id;
       }
     });
   };
 }
-
-function RegistryCategoryModalController($scope, Registry, UIUtils, parameters) {
-  'ngInject';
-
-  $scope.loading = true;
-  $scope.allCategories = [];
-  $scope.categories = [];
-  this.searchText = '';
-
-  // load categories
-  Registry.category.all()
-  .then(function(result){
-    $scope.categories = result;
-    $scope.allCategories = result;
-    $scope.loading = false;
-    UIUtils.ink();
-  });
-
-  this.doSearch = function() {
-    var searchText = this.searchText.toLowerCase().trim();
-    if (searchText.length > 1) {
-      $scope.loading = true;
-      $scope.categories = $scope.allCategories.reduce(function(result, cat) {
-        if (cat.parent && cat.name.toLowerCase().search(searchText) != -1) {
-            return result.concat(cat);
-        }
-        return result;
-      }, []);
-
-      $scope.loading = false;
-    }
-    else {
-      $scope.categories = $scope.allCategories;
-    }
-  };
-}
-
-function RegistryRecordTypeModalController($scope, parameters) {
-
-
-}

www/plugins/es/js/controllers/user-controllers.js

 angular.module('cesium.user.controllers', ['cesium.services', 'ngSanitize'])
 
-  .config(function($menuProvider) {
+  .config(function($menuProvider, $stateProvider, $urlRouterProvider) {
     'ngInject';
     $menuProvider.addItem({
       text: 'MENU.USER_PROFILE',
       icon: "ion-person",
       section: $menuProvider.sections.USER,
-      url: '#/app/user/profile',
+      url: '#/app/user/profile/edit',
       ngIf: "isLogged()"
     });
 
@@ -14,26 +14,20 @@ angular.module('cesium.user.controllers', ['cesium.services', 'ngSanitize'])
       text: 'MENU.USER_PROFILE',
       icon: "ion-person",
       section: $menuProvider.sections.USER,
-      ngClick: "login('app.user_profile')",
+      ngClick: "login('app.user_edit_profile')",
       ngIf: "!isLogged()"
     });
-  })
-
-  .config(function($stateProvider, $urlRouterProvider) {
-    'ngInject';
 
-    $stateProvider
-
-    .state('app.user_profile', {
-      url: "/user/profile",
+    $stateProvider.state('app.user_edit_profile', {
+      url: "/user/profile/edit",
       views: {
         'menuContent': {
-          templateUrl: "plugins/es/templates/user/profile.html",
+          templateUrl: "plugins/es/templates/user/edit_profile.html",
           controller: 'ProfileCtrl'
         }
       }
-    })
-    ;
+    });
+
   })
 
  .controller('ProfileCtrl', ProfileController)

www/plugins/es/js/services/es-services.js

@@ -5,6 +5,12 @@ angular.module('cesium.es.services', ['ngResource', 'cesium.services', 'cesium.c
 
   function ESUtils(server) {
 
+    // Get time (UTC)
+    function getTimeNow() {
+       // TODO : use the block chain time
+       return Math.floor(moment().utc().valueOf() / 1000);
+    }
+
     function postRecord(uri) {
       var postRequest = HttpUtils.post(uri);
 
@@ -16,6 +22,9 @@ angular.module('cesium.es.services', ['ngResource', 'cesium.services', 'cesium.c
           var errorFct = function(err) {
             reject(err);
           };
+          if (!record.time) {
+            record.time = getTimeNow();
+          }
           var keypair = $rootScope.walletData.keypair;
           var obj = {};
           angular.copy(record, obj);
@@ -59,8 +68,7 @@ angular.module('cesium.es.services', ['ngResource', 'cesium.services', 'cesium.c
             type: type,
             id: id,
             issuer: $rootScope.walletData.pubkey,
-            // TODO: get blockchain time ?
-            time: Math.floor(moment().utc().valueOf() / 1000)
+            time: getTimeNow()
           };
           var str = JSON.stringify(obj);
           CryptoUtils.util.hash(str)
@@ -82,6 +90,7 @@ angular.module('cesium.es.services', ['ngResource', 'cesium.services', 'cesium.c
       };
     }
 
+
     function login(keypair) {
       return $q(function(resolve, reject) {
         var errorFct = function(err) {
@@ -149,6 +158,9 @@ angular.module('cesium.es.services', ['ngResource', 'cesium.services', 'cesium.c
       },
       hit: {
          empty: emptyHit
+      },
+      date: {
+        now: getTimeNow
       }
     };
   }

www/plugins/es/js/services/user-services.js

 angular.module('cesium.user.services', ['cesium.services', 'cesium.es.services'])
+.config(function(PluginServiceProvider) {
+    'ngInject';
+
+    PluginServiceProvider.registerEagerLoadingService('UserService');
+
+  })
 
 .factory('UserService', function(APP_CONFIG, $rootScope, ESUtils, Wallet, IdentityService, UIUtils) {
   'ngInject';
@@ -126,9 +132,9 @@ angular.module('cesium.user.services', ['cesium.services', 'cesium.es.services']
     }
 
     // Extend Wallet.loadData() and IdentityService.loadData()
-    Wallet.api.data.on.load($rootScope, doLoad);
-    IdentityService.api.data.on.load($rootScope, doLoad);
-    IdentityService.api.data.on.search($rootScope, doSearch);
+    Wallet.api.data.on.load($rootScope, doLoad, this);
+    IdentityService.api.data.on.load($rootScope, doLoad, this);
+    IdentityService.api.data.on.search($rootScope, doSearch, this);
 
     return {
       profile: {