diff --git a/.idea/mobilizon.chapril.org-tools.iml b/.idea/mobilizon.chapril.org-tools.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/mobilizon.chapril.org-tools.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 6f68488..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 245cfb3..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1605258558512
-
-
- 1605258558512
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/rapport_activite/rapport_activite.sh b/rapport_activite/rapport_activite.sh
index f843780..d98915b 100755
--- a/rapport_activite/rapport_activite.sh
+++ b/rapport_activite/rapport_activite.sh
@@ -83,14 +83,6 @@ generateHTTPReport()
echo
}
-# display the value of a key in the json fetched with curl
-function show
-{
- # to navigate to sub keys like data.statistics.my_key , we must use multiple -e extract options
- local value=$(echo "$json" | jshon -e "data" -e "statistics" -e $1 -u)
- printf "$1=$value\n"
-}
-
#
generateSpecificReport()
{
@@ -125,19 +117,17 @@ generateSpecificReport()
echo "Nombre d'ipv6 utilisatrices du service = $ipv6UserCount"
echo "Nombre total d'ip utilisatrices du service = $((ipv4UserCount+ipv6UserCount))"
- echo "Nombre total d'erreurs = $errorsCount"
+ echo "Nombre total d'erreurs = $errorsCount"
+ echo "Nombre d'évènements = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfEvents" -u)"
+ echo "Nombre d'évènements locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalEvents" -u)"
+ echo "Nombre de groupes = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfGroups" -u)"
+ echo "Nombre de groupes locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalGroups" -u)"
+ echo "Nombre de commentaires = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfComments" -u)"
+ echo "Nombre de commentaires locaux = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfLocalComments" -u)"
+ echo "Nombre d'instances abonnées = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfInstanceFollowers" -u)"
+ echo "Nombre d'instances suivies = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfInstanceFollowings" -u)"
+ echo "Nombre d'utilisateurices selon l'api = $(echo "$json" | jshon -e "data" -e "statistics" -e "numberOfUsers" -u)"
- show "numberOfEvents"
- show "numberOfLocalEvents"
- show "numberOfGroups"
- show "numberOfLocalGroups"
- show "numberOfComments"
- show "numberOfLocalComments"
- show "numberOfInstanceFollowers"
- show "numberOfInstanceFollowings"
- show "numberOfUsers"
-# echo "Nombre d'évènements passés"
-# echo "Nombre d'évènements à venir"
echo
}