- fix #184 - Wot/ last registration were not displsayed, when an user has more than ONE membership doc

- Join: more precise message (too long, too short value)

Author: blavenie

scss/ionic.app.scss

@@ -1182,7 +1182,7 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
    Help Tip
 **********/
 .popover-helptip {
-  background-color:rgba(68, 68, 68, 0.85);
+  background-color:rgba(68, 68, 68, 0.85) !important;
   height: auto !important;
 }
 

www/css/ionic.app.css

@@ -13796,7 +13796,7 @@ a {
    Help Tip
 **********/
 .popover-helptip {
-  background-color: rgba(68, 68, 68, 0.85);
+  background-color: rgba(68, 68, 68, 0.85) !important;
   height: auto !important; }
 
 /**********

www/css/ionic.app.min.css

@@ -44,7 +44,7 @@
     "ENABLE": "Activé",
     "DISABLE": "Désactivé",
     "RESULTS_LIST": "Résultats :",
-    "SHOW_VALUES": "Afficher les valeurs saisies",
+    "SHOW_VALUES": "Afficher les valeurs en clair ?",
     "POPOVER_SHARE": {
       "TITLE": "Partager",
       "SHARE_ON_TWITTER": "Partager sur Twitter",
@@ -281,7 +281,9 @@
     "CRYPTO_UNKNOWN_ERROR": "Votre navigateur ne semble pas compatible avec les fonctionnalités de cryptographie.",
     "FIELD_REQUIRED": "Champ obligatoire.",
     "FIELD_TOO_SHORT": "Valeur trop courte.",
+    "FIELD_TOO_SHORT_WITH_LENGTH": "Valeur trop courte ({{minLength}} caractères min)",
     "FIELD_TOO_LONG": "Valeur trop longue",
+    "FIELD_TOO_LONG_WITH_LENGTH": "Valeur trop longue ({{maxLength}} caractères max)",
     "FIELD_ACCENT": "Caractères accentués et virgules non autorisés",
     "PASSWORD_NOT_CONFIRMED": "Ne correspond pas au mot de passe.",
     "SALT_NOT_CONFIRMED": "Ne correspond pas à la phrase de protection.",

www/i18n/locale-fr-FR.json

@@ -19,22 +19,7 @@ angular.module('cesium.utils.services', ['ngResource'])
     },
     regex = {
       IMAGE_SRC: exact("data:([A-Za-z//]+);base64,(.+)")
-    },
-    eventMatchers = {
-      'HTMLEvents': /^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/,
-      'MouseEvents': /^(?:click|dblclick|mouse(?:down|up|over|move|out))$/
-    },
-    eventDefaultOptions = {
-        pointerX: 0,
-        pointerY: 0,
-        button: 0,
-        ctrlKey: false,
-        altKey: false,
-        shiftKey: false,
-        metaKey: false,
-        bubbles: true,
-        cancelable: true
-      }
+    }
   ;
 
   function alertError(err, subtitle) {

www/js/services/utils-services.js

@@ -501,38 +501,57 @@ angular.module('cesium.wot.services', ['ngResource', 'ngApi', 'cesium.bma.servic
           if (!res.memberships || !res.memberships.length) {
             return null;
           }
-          var idtiesByBlock = {}; // TODO: workaround for Duniter#667 - https://github.com/duniter/duniter/issues/667
-          var idties = res.memberships.reduce(function(res, ms){
-            if (ms.membership === 'IN') {
+          var idtiesByBlock = {};
+          var idtiesByPubkey = {};
+          var idties = [];
+          _.forEach(res.memberships, function(ms){
+            if (ms.membership == 'IN') {
               var idty = {
                 uid: ms.uid,
                 pubkey: ms.pubkey,
                 block: ms.blockNumber,
                 blockHash: ms.blockHash
               };
-              if (!idtiesByBlock[ms.blockNumber]) {
-                idtiesByBlock[ms.blockNumber] = [idty];
+              var otherIdtySamePubkey = idtiesByPubkey[ms.pubkey];
+              if (otherIdtySamePubkey && idty.block > otherIdtySamePubkey.block) {
+                return; // skip
+              }
+              idtiesByPubkey[idty.pubkey] = idty;
+              if (!idtiesByBlock[idty.block]) {
+                idtiesByBlock[idty.block] = [idty];
               }
               else {
-                idtiesByBlock[ms.blockNumber].push(idty);
+                idtiesByBlock[idty.block].push(idty);
+              }
+
+              // Remove previous idty from maps
+              if (otherIdtySamePubkey) {
+                idtiesByBlock[otherIdtySamePubkey.block] = idtiesByBlock[otherIdtySamePubkey.block].reduce(function(res, aidty){
+                  if (aidty.pubkey == otherIdtySamePubkey.pubkey) return res; // if match idty to remove, to NOT add
+                  return (res||[]).concat(aidty);
+                }, null);
+                if (idtiesByBlock[otherIdtySamePubkey.block] === null) {
+                  delete idtiesByBlock[otherIdtySamePubkey.block];
+                }
+                return;
+              }
+              else {
+                idties.push(idty);
               }
-              return res.concat(idty);
             }
-            return res;
-          }, []);
-          idties = _sortAndLimitIdentities(idties, size);
+          });
+          idties = _sortAndLimitIdentities(idtiesByPubkey, size);
 
           return BMA.blockchain.blocks(_.keys(idtiesByBlock))
             .then(function(blocks) {
 
               _.forEach(blocks, function(block){
                 _.forEach(idtiesByBlock[block.number], function(idty) {
                   idty.sigDate = block.medianTime;
-                  idty.valid = (idty.blockHash === block.hash);
-                  //if (!idty.valid) {
+                  if (idty.blockHash !== block.hash) {
                     idty.errors = ['INVALID_MS_BLOCK_HASH'];
                     console.debug("Invalid membership for uid={0}: block hash not match a real block (block cancelled)".format(idty.uid));
-                  //}
+                  }
                 });
               });
               return $q(function(resolve, reject) {

www/js/services/wot-services.js

@@ -125,10 +125,7 @@ <h4 class="gray" translate>ACCOUNT.NEW.WALLET_ACCOUNT_HELP</h4>
                    ng-show="saltForm.$submitted && saltForm.username.$error"
                    ng-messages="saltForm.username.$error">
                 <div class="form-error" ng-message="minlength">
-                  <span translate="ERROR.FIELD_TOO_SHORT"></span>
-                </div>
-                <div class="form-error" ng-message="maxlength">
-                  <span translate="ERROR.FIELD_TOO_LONG"></span>
+                  <span translate="ERROR.FIELD_TOO_SHORT_WITH_LENGTH" translate-values="{minLength: 8}"></span>
                 </div>
                 <div class="form-error" ng-message="required">
                   <span translate="ERROR.FIELD_REQUIRED"></span>
@@ -225,7 +222,7 @@ <h4 class="gray" translate>ACCOUNT.NEW.WALLET_ACCOUNT_HELP</h4>
                    ng-show="passwordForm.$submitted && passwordForm.password.$error"
                    ng-messages="passwordForm.password.$error">
                 <div class="form-error" ng-message="minlength">
-                  <span translate="ERROR.FIELD_TOO_SHORT"></span>
+                  <span translate="ERROR.FIELD_TOO_SHORT_WITH_LENGTH" translate-values="{minLength: 8}"></span>
                 </div>
                 <div class="form-error" ng-message="maxlength">
                   <span translate="ERROR.FIELD_TOO_LONG"></span>
@@ -322,10 +319,10 @@ <h4 class="gray" translate>ACCOUNT.NEW.WALLET_ACCOUNT_HELP</h4>
                    ng-show="pseudoForm.$submitted && pseudoForm.pseudo.$error"
                    ng-messages="pseudoForm.pseudo.$error">
                 <div class="form-error" ng-message="minlength">
-                  <span translate="ERROR.FIELD_TOO_SHORT"></span>
+                  <span translate="ERROR.FIELD_TOO_SHORT_WITH_LENGTH" translate-values="{minLength: 3}"></span>
                 </div>
                 <div class="form-error" ng-message="maxlength">
-                  <span translate="ERROR.FIELD_TOO_LONG"></span>
+                  <span translate="ERROR.FIELD_TOO_LONG_WITH_LENGTH" translate-values="{maxLength: 100}"></span>
                 </div>
                 <div class="form-error" ng-message="required">
                   <span translate="ERROR.FIELD_REQUIRED"></span>