MAJ novembre pour la 1.2

Alain Klotz
1 parent 9eabdec5
Showing 3 changed files with 14 additions and 13 deletions Show diff stats
src/utils/celme/dates.py
src/utils/report/doc/user_guide_module_report.odt
src/utils/report/status_json.py
@@ -2,6 +2,7 @@ import datetime
 import math
 import doctest
 import typing 
+from typing import Union
 try:
     from .durations import Duration
 except:
@@ -73,7 +74,7 @@ class Date:
 # === internal methods
 # ========================================================
  
-    def _init(self,date="") -> None:
+    def _init(self,date: Union[str, float] = "") -> None:
         """ Initialize internal attributes.
  
         :param date: date is a date in any supported format (cf. help(Date))
@@ -1053,7 +1054,7 @@ class Date:
         """
         return self + duration
  
-    def __sub__(self, object_or_duration):
+    def __sub__(self, object_or_duration: Union["Date", float]) -> "Date":
         """ Subtract a duration to a date (returns an object date) or Compute the duration between two date objects.
  
         Inputs:
@@ -8,7 +8,7 @@ py_path = os.sys.path
 py_pwd = os.getcwd()
 if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
-py_pwd = os.getcwd() + "/.."
+py_pwd = os.getcwd() + "/../.."
 if (py_pwd not in py_path):
     (os.sys.path).append(py_pwd)
  
@@ -31,7 +31,7 @@ Example a a very wimple Json file report contents:
   "entities": [
     {
       "entity_name": "PLC_STATUS",
-      "from": "Raspberry",
+      "origin": "Raspberry",
       "version_firmware": "20180924A",
       "site": "MyObservatory",
       "date": "2018-09-25T22:24:16.387",
@@ -244,10 +244,10 @@ https://github.com/hjson/hjson-py
         #self._status['statuses'].append(status_header)
         self._status = status_header
  
-    def _status_new_entity(self, entity_name, thefrom, version_firmware, site, date=""):
+    def _status_new_entity(self, entity_name, theorigin, version_firmware, site, date=""):
         if date=="":
             date = (celme.Date("now")).iso()
-        entity= {'entity_name':entity_name, 'from':thefrom, 'version_firmware':version_firmware, 'site':site, 'date':date, 'devices':[]}
+        entity= {'entity_name':entity_name, 'origin':theorigin, 'version_firmware':version_firmware, 'site':site, 'date':date, 'devices':[]}
         #self._status['statuses'][0]['entities'].append(entity);
         self._status['entities'].append(entity);
  
@@ -260,7 +260,7 @@ https://github.com/hjson/hjson-py
         #self._status['statuses'][0]['entities'][indicee]['devices'].append(device)
         self._status['entities'][indicee]['devices'].append(device)
  
-    def _status_entity_device_new_value(self, entity_name, device_name, serial_number, name, thetype, value, unit="", monitoring_name="", comment=""):
+    def _status_entity_device_new_value(self, entity_name, device_name, serial_number, name, data_type, value, unit="", monitoring_name="", comment=""):
         entities = self._get_entity_names()
         indicee = self._get_indice_from_entities(entities,entity_name)
         if indicee == -1:
@@ -270,7 +270,7 @@ https://github.com/hjson/hjson-py
         indiced = self._get_indice_from_devices(devices, device_name, serial_number)
         if indiced == -1:
             return ""
-        dico = {'name':name, 'type':thetype, 'value':value, 'unit':unit, 'monitoring_name':monitoring_name, 'comment':comment}
+        dico = {'name':name, 'data_type':data_type, 'value':value, 'unit':unit, 'monitoring_name':monitoring_name, 'comment':comment}
         #self._status['statuses'][0]['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
         self._status['entities'][indicee]['devices'][indiced]['device_values'].append(dico)
  
@@ -297,7 +297,7 @@ https://github.com/hjson/hjson-py
         self._init()
         self._status_new(name_creator, version_creator)
  
-    def append_entity(self, entity_name, thefrom, version_firmware, site, date=""):
+    def append_entity(self, entity_name, theorigin, version_firmware, site, date=""):
         """ Append a new entity to a creator
  
         Inputs:
@@ -314,7 +314,7 @@ https://github.com/hjson/hjson-py
         ---------------
         Methods append_device, get_entities
         """
-        self._status_new_entity(entity_name, thefrom, version_firmware, site, date)
+        self._status_new_entity(entity_name, theorigin, version_firmware, site, date)
         self._entity_name = entity_name
  
     def append_device(self, device_name, device_type, serial_number, error_code):
@@ -340,7 +340,7 @@ https://github.com/hjson/hjson-py
         self._device_name = device_name
         self._serial_number = serial_number
  
-    def append_value(self, name, thetype, value, unit="", monitoring_name="", comment=""):
+    def append_value(self, name, data_type, value, unit="", monitoring_name="", comment=""):
         """ Append a new value to a device
  
         Inputs:
@@ -362,7 +362,7 @@ https://github.com/hjson/hjson-py
         entity_name = self._entity_name
         device_name = self._device_name
         serial_number = self._serial_number
-        self._status_entity_device_new_value(entity_name, device_name, serial_number, name, thetype, value, unit, monitoring_name, comment)
+        self._status_entity_device_new_value(entity_name, device_name, serial_number, name, data_type, value, unit, monitoring_name, comment)
  
     def load_json(self, full_filename):        
         """ Load a Json file as an object
@@ -667,6 +667,6 @@ if __name__ == &quot;__main__&quot;:
     res = rep.get_devices()
     print(" devices = {}".format(res))
     print(" List of all UFKIs:")
-    ufiks = rep.get_values("","",False)
+    ufiks = rep.get_values("","",True)
     for ufik in ufiks:
         print("  UFKI = {}".format(ufik))