Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
O
oacc_portal_overview_cdc
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
Opération Auto-Consommation Collective
oacc_portal_overview_cdc
Validations
0e0e6708
Valider
0e0e6708
rédigé
Il y a 1 mois
par
Rémi - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[FIX] export when no curve type defined
parent
63f75568
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
1
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
1 fichier modifié
tools/export_cdc.py
+26
-20
26 ajouts, 20 suppressions
tools/export_cdc.py
avec
26 ajouts
et
20 suppressions
tools/export_cdc.py
+
26
−
20
Voir le fichier @
0e0e6708
...
...
@@ -99,33 +99,37 @@ def make_cons_data(energy_dict):
# horodatage
period
.
strftime
(
"
%d/%m/%Y %H:%M
"
),
# consommation en kwh
str
(
round
(
energy_dict
[
period
]
[
"
cons
"
]
,
rounding
)),
str
(
round
(
energy_dict
[
period
]
.
get
(
"
cons
"
,
0.0
)
,
rounding
)),
# allocons
str
(
round
(
energy_dict
[
period
]
[
"
cons
"
]
-
energy_dict
[
period
]
[
"
autocons
"
]
,
energy_dict
[
period
]
.
get
(
"
cons
"
,
0.0
)
-
energy_dict
[
period
]
.
get
(
"
autocons
"
,
0.0
)
,
rounding
,
)
),
# autocons
str
(
round
(
energy_dict
[
period
]
[
"
autocons
"
]
,
rounding
)),
str
(
round
(
energy_dict
[
period
]
.
get
(
"
autocons
"
,
0.0
)
,
rounding
)),
]
)
)
sum_value
[
"
cons
"
]
+=
round
(
energy_dict
[
period
][
"
cons
"
],
rounding
)
sum_value
[
"
auto_cons
"
]
+=
round
(
energy_dict
[
period
][
"
autocons
"
],
rounding
)
sum_value
[
"
cons
"
]
+=
round
(
energy_dict
[
period
].
get
(
"
cons
"
,
0.0
),
rounding
)
sum_value
[
"
auto_cons
"
]
+=
round
(
energy_dict
[
period
].
get
(
"
autocons
"
,
0.0
),
rounding
)
sum_value
[
"
allo_cons
"
]
+=
round
(
energy_dict
[
period
][
"
cons
"
]
-
energy_dict
[
period
][
"
autocons
"
],
rounding
energy_dict
[
period
].
get
(
"
cons
"
,
0.0
)
-
energy_dict
[
period
].
get
(
"
autocons
"
,
0.0
),
rounding
,
)
tot
=
"
;
"
.
join
(
[
"
TOTAL
"
,
str
(
round
(
sum_value
.
get
(
"
cons
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
allo_cons
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
auto_cons
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
cons
"
,
0.0
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
allo_cons
"
,
0.0
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
auto_cons
"
,
0.0
),
rounding
)),
]
)
data_file_lines
.
insert
(
0
,
tot
)
...
...
@@ -149,33 +153,35 @@ def make_prod_data(energy_dict):
# horodatage
period
.
strftime
(
"
%d/%m/%Y %H:%M
"
),
# production en kwh
str
(
round
(
energy_dict
[
period
]
[
"
prod
"
]
,
rounding
)),
str
(
round
(
energy_dict
[
period
]
.
get
(
"
prod
"
,
0.0
)
,
rounding
)),
# surplus
str
(
round
(
energy_dict
[
period
]
[
"
surplus
"
]
,
rounding
)),
str
(
round
(
energy_dict
[
period
]
.
get
(
"
surplus
"
,
0.0
)
,
rounding
)),
# autocons
str
(
round
(
energy_dict
[
period
]
[
"
prod
"
]
-
energy_dict
[
period
]
[
"
surplus
"
]
,
energy_dict
[
period
]
.
get
(
"
prod
"
,
0.0
)
-
energy_dict
[
period
]
.
get
(
"
surplus
"
,
0.0
)
,
rounding
,
)
),
]
)
)
sum_value
[
"
prod
"
]
+=
round
(
energy_dict
[
period
]
[
"
prod
"
]
,
rounding
)
sum_value
[
"
surplus
"
]
+=
round
(
energy_dict
[
period
]
[
"
surplus
"
]
,
rounding
)
sum_value
[
"
prod
"
]
+=
round
(
energy_dict
[
period
]
.
get
(
"
prod
"
,
0.0
)
,
rounding
)
sum_value
[
"
surplus
"
]
+=
round
(
energy_dict
[
period
]
.
get
(
"
surplus
"
,
0.0
)
,
rounding
)
sum_value
[
"
auto_cons
"
]
+=
round
(
energy_dict
[
period
][
"
prod
"
]
-
energy_dict
[
period
][
"
surplus
"
],
rounding
energy_dict
[
period
].
get
(
"
prod
"
,
0.0
)
-
energy_dict
[
period
].
get
(
"
surplus
"
,
0.0
),
rounding
,
)
tot
=
"
;
"
.
join
(
[
"
TOTAL
"
,
""
,
str
(
round
(
sum_value
.
get
(
"
prod
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
surplus
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
auto_cons
"
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
prod
"
,
0.0
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
surplus
"
,
0.0
),
rounding
)),
str
(
round
(
sum_value
.
get
(
"
auto_cons
"
,
0.0
),
rounding
)),
]
)
data_file_lines
.
insert
(
0
,
tot
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter