From 0cc552e10872a3501c1674d88c9c6a149832e603 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 8 Jan 2018 16:37:29 +0100
Subject: [PATCH] [fix] Currency: Add msValidty parameter - fix #645
---
www/i18n/locale-en-GB.json | 1 +
www/i18n/locale-en.json | 1 +
www/i18n/locale-es-ES.json | 3 ++-
www/i18n/locale-fr-FR.json | 1 +
www/js/config.js | 4 ++--
www/js/controllers/currency-controllers.js | 2 ++
www/templates/currency/items_wot.html | 7 +++++++
7 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index d63ff559..2b8e0cd3 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -235,6 +235,7 @@
"SIG_WINDOW": "Maximum delay before a certification will be treated",
"SIG_VALIDITY": "Lifetime of a certification that has been treated",
"MS_WINDOW": "Maximum delay before a pending membership will be treated",
+ "MS_VALIDITY": "Lifetime of a membership that has been treated",
"STEP_MAX": "Maximum distance between a newcomer and each referring members.",
"WOT_RULES_DIVIDER": "Rules for web of trust",
"SENTRIES": "Required number of certifications (given <b>and</b> received) to become a referring member",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 30687381..45a3e702 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -235,6 +235,7 @@
"SIG_WINDOW": "Maximum delay before a certification will be treated",
"SIG_VALIDITY": "Lifetime of a certification that has been treated",
"MS_WINDOW": "Maximum delay before a pending membership will be treated",
+ "MS_VALIDITY": "Lifetime of a membership that has been treated",
"STEP_MAX": "Maximum distance between a newcomer and each referring members.",
"WOT_RULES_DIVIDER": "Rules for web of trust",
"SENTRIES": "Required number of certifications (given <b>and</b> received) to become a referring member",
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index 22d059c9..8676632e 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -234,7 +234,8 @@
"SIG_PERIOD": "Plazo mÃnimo de espera entre 2 certificaciónes sucesivas emitidas por la misma persona",
"SIG_WINDOW": "Plazo lÃmite para toma en cuenta de una certificación",
"SIG_VALIDITY": "Duración de una certificación que se ha tenido en cuenta.",
- "MS_WINDOW": "Plazo lÃmite para toma en cuenta de una adhesión",
+ "MS_WINDOW": "Duración lÃmite para toma en cuenta de una adhesión",
+ "MS_VALIDITY": "Duración de una adhesión que se ha tenido en cuenta",
"STEP_MAX": "Distancia máxima entre un nuevo entrante y los miembros referentes",
"WOT_RULES_DIVIDER": "Regla de la red de confianza",
"SENTRIES": "Número de certificaciónes necesarias para hacerse miembro referente",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index ea269298..831079a8 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -235,6 +235,7 @@
"SIG_WINDOW": "Délai limite de prise en compte d'une certification",
"SIG_VALIDITY": "Durée de vie d'une certification qui a été prise en compte",
"MS_WINDOW": "Délai limite de prise en compte d'une demande d'adhésion comme membre",
+ "MS_VALIDITY": "Durée de vie d'une adhésion qui a été prise en compte",
"STEP_MAX": "Distance maximale, par les certifications, entre un nouvel entrant et les membres référents",
"WOT_RULES_DIVIDER": "Règles de la toile de confiance",
"SENTRIES": "Nombre de certifications (émises <b>et</b> reçues) pour devenir membre référent",
diff --git a/www/js/config.js b/www/js/config.js
index 7c767dd9..e43850e4 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -80,8 +80,8 @@ angular.module("cesium.config", [])
}
},
"version": "1.0.2",
- "build": "2017-12-01T16:50:26.623Z",
- "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
+ "build": "2018-01-08T14:51:00.382Z",
+ "newIssueUrl": "https://git.duniter.org/clients/cesium/cesium/issues/new"
})
;
\ No newline at end of file
diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index 8f5cb648..af06607b 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -90,6 +90,7 @@ function CurrencyViewController($scope, $q, $timeout, $ionicPopover, Modals, BMA
sigQty: 0,
sigStock: 0,
msWindow: 0,
+ msValidity: 0,
sigWindow: 0,
sigValidity: 0,
sigPeriod: 0,
@@ -154,6 +155,7 @@ function CurrencyViewController($scope, $q, $timeout, $ionicPopover, Modals, BMA
data.sigQty = json.sigQty;
data.sigStock = json.sigStock;
data.msWindow = json.msWindow;
+ data.msValidity = json.msValidity;
data.sigWindow = json.sigWindow;
data.sigValidity = json.sigValidity;
data.sigPeriod = json.sigPeriod;
diff --git a/www/templates/currency/items_wot.html b/www/templates/currency/items_wot.html
index ee2ad20b..e45ed104 100644
--- a/www/templates/currency/items_wot.html
+++ b/www/templates/currency/items_wot.html
@@ -43,6 +43,13 @@
<span class="badge badge-assertive" ng-if="!loading">{{formData.msWindow | formatDuration}}</span>
</ion-item>
+ <ion-item class="item-icon-left item-text-wrap">
+ <i class="icon ion-person"></i>
+ <b class="ion-calendar icon-secondary" style="font-size: 18px; left: 33px; top: -12px;"></b>
+ <span class="col col-60" translate>CURRENCY.VIEW.MS_VALIDITY</span>
+ <span class="badge badge-balanced" ng-if="!loading">{{formData.msValidity | formatDuration}}</span>
+ </ion-item>
+
<ion-item class="item-icon-left item-text-wrap" ng-if="formData.allWotRules">
<i class="icon ion-ribbon-b"></i>
<b class="ion-clock icon-secondary" style="font-size: 18px; left: 33px; top: -12px;"></b>
--
GitLab