Update index
This commit is contained in:
parent
8d095771fc
commit
4000196acb
|
@ -54,7 +54,7 @@ web() {
|
||||||
sed -i "s/_pourcentSimpleWallet/$pourcentSimpleWallet/g" $indexhtml
|
sed -i "s/_pourcentSimpleWallet/$pourcentSimpleWallet/g" $indexhtml
|
||||||
sed -i "s/_nonConsumedUDT/$nonConsumedUDT/g" $indexhtml
|
sed -i "s/_nonConsumedUDT/$nonConsumedUDT/g" $indexhtml
|
||||||
sed -i "s/_monetaryMass/$monetaryMass/g" $indexhtml
|
sed -i "s/_monetaryMass/$monetaryMass/g" $indexhtml
|
||||||
sed -i "s/_sleepyG1/$sleepyG1/g" $indexhtml
|
# sed -i "s/_sleepyG1/$sleepyG1/g" $indexhtml
|
||||||
[[ -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/_datePrevious/$datePrevious/g" $indexhtml && setPrevious="Oui"
|
[[ -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/_datePrevious/$datePrevious/g" $indexhtml && setPrevious="Oui"
|
||||||
[[ -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/_dateNext/$dateNext/g" $indexhtml && setNext="Oui"
|
[[ -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/_dateNext/$dateNext/g" $indexhtml && setNext="Oui"
|
||||||
|
|
||||||
|
|
|
@ -7,10 +7,14 @@ source $GPATH/.env
|
||||||
timeout=120
|
timeout=120
|
||||||
startLoop=$(date +%s)
|
startLoop=$(date +%s)
|
||||||
|
|
||||||
[[ $(ps -aux | grep "[g]eoloc-members") ]] && echo "ERROR: Script is still started... exit." && exit 1
|
|
||||||
|
|
||||||
echo "### $(date +%d-%m-%y) ###"
|
echo "### $(date +%d-%m-%y) ###"
|
||||||
|
|
||||||
|
# Exit if script is already alive
|
||||||
|
if pidof -o %PPID -x "geoloc-members-json.sh">/dev/null; then
|
||||||
|
echo "Process already running"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
FILE="/tmp/geoloc-members.json"
|
FILE="/tmp/geoloc-members.json"
|
||||||
FINAL_LOCATION="$WEBPATH/data/geoloc-members.json"
|
FINAL_LOCATION="$WEBPATH/data/geoloc-members.json"
|
||||||
FINAL_LOCATION_ALT="$WEBPATH/data/geoloc-members-alt.json"
|
FINAL_LOCATION_ALT="$WEBPATH/data/geoloc-members-alt.json"
|
||||||
|
|
|
@ -24,26 +24,23 @@
|
||||||
|
|
||||||
<div id="mainbloc">
|
<div id="mainbloc">
|
||||||
<pre>
|
<pre>
|
||||||
Date: <b>_day - _heure</b>
|
Date: <b>_day - _heure</b>
|
||||||
Noeud scanné: <b>https://duniter-g1.p2p.legal</b>
|
Noeud scanné: <b>https://g1.librelois.fr</b>
|
||||||
---
|
---
|
||||||
Nombre total de portefeuille: <b>_nbrTotalWallets</b>
|
Nombre total de portefeuille: <b>_nbrTotalWallets</b>
|
||||||
Nombre de membres: <b>_nbrMembers</b> (_pourcentMbrs%)
|
Nombre de membres: <b>_nbrMembers</b> (_pourcentMbrs%)
|
||||||
Nombre de simple portefeuille: <b>_nbrSimpleWallets</b> (_pourcentWallets%)
|
Nombre de simple portefeuille: <b>_nbrSimpleWallets</b> (_pourcentWallets%)
|
||||||
---
|
---
|
||||||
Reçus simples portefeuille: <b>_sumRW Ḡ1</b>
|
Reçus simples portefeuille: <b>_sumRW Ḡ1</b>
|
||||||
Envoyé simples portefeuille: <b>_sumSW Ḡ1</b>
|
Envoyé simples portefeuille: <b>_sumSW Ḡ1</b>
|
||||||
Soldes simples portefeuille: <b>_soldeW Ḡ1</b> (_pourcentSimpleWallet% de la masse monétaire totale)
|
Soldes simples portefeuille: <b>_soldeW Ḡ1</b> (_pourcentSimpleWallet% de la masse monétaire totale)
|
||||||
---
|
---
|
||||||
Reçus membres: <b>_sumRM Ḡ1</b> (sans les DU)
|
Reçus membres: <b>_sumRM Ḡ1</b> (sans les DU)
|
||||||
Envoyé membres: <b>_sumSM Ḡ1</b>
|
Envoyé membres: <b>_sumSM Ḡ1</b>
|
||||||
Soldes membres: <b>_soldeM Ḡ1</b> (sans les DU)
|
Soldes membres: <b>_soldeM Ḡ1</b> (sans les DU)
|
||||||
---
|
---
|
||||||
Masse monétaire: <b>_monetaryMass Ḡ1</b>
|
Masse monétaire: <b>_monetaryMass Ḡ1</b>
|
||||||
|
|
||||||
---
|
|
||||||
<h3>Analyse rapide</h3>
|
|
||||||
<b>_sleepyG1%</b> des Ḡ1 n'ont jamais été utilisés.
|
|
||||||
</pre>
|
</pre>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue