malac-utils 1.3.1__tar.gz → 1.3.3__tar.gz

{malac_utils-1.3.1/malac_utils.egg-info → malac_utils-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.3.1
+Version: 1.3.3
 Summary: Mapping Language Compiler Utils
 Author-email: cdeHealth-Team <contact-project+cdehealth-malac-hd-52276676-issue-@incoming.gitlab.com>
 Project-URL: Homepage, https://gitlab.com/cdehealth/malac-hd

malac_utils-1.3.3/malac/utils/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = "1.3.3"

{malac_utils-1.3.1 → malac_utils-1.3.3}/malac/utils/date.py

@@ -8,10 +8,15 @@ class PartialDate:
 
     def isoformat(self):
         return self.value
+    
+    def __repr__(self):
+        return self.value
 
 def parse(datestr):
     datestr = getattr(datestr, "value", datestr)
-    if re.search("^[0-9]{1,6}$", datestr):
+    if re.search("^[0-9]{1,8}$", datestr):
+        if len(datestr) > 6:
+            return PartialDate(datestr[0:4] + '-' + datestr[4:6] + '-' + datestr[6:])
         if len(datestr) > 4:
             return PartialDate(datestr[0:4] + "-" + datestr[4:])
         else:

{malac_utils-1.3.1 → malac_utils-1.3.3}/malac/utils/fhirpath.py

@@ -1018,12 +1018,12 @@ class FHIRPathUtils(object):
             result = "true" if self.boolean_value(val) else "false"
         elif isinstance(val, self.model.integer) or isinstance(val, int):
             if isinstance(val, self.model.integer):
-                result = val.value
+                result = str(val.value)
             else:
                 result = str(val)
         elif isinstance(val, self.model.decimal) or isinstance(val, decimal.Decimal):
             if isinstance(val, self.model.decimal):
-                result = val.value
+                result = str(val.value)
             else:
                 result = str(val)
         elif isinstance(val, dateutil.PartialDate):

{malac_utils-1.3.1 → malac_utils-1.3.3/malac_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: malac-utils
-Version: 1.3.1
+Version: 1.3.3
 Summary: Mapping Language Compiler Utils
 Author-email: cdeHealth-Team <contact-project+cdehealth-malac-hd-52276676-issue-@incoming.gitlab.com>
 Project-URL: Homepage, https://gitlab.com/cdehealth/malac-hd

malac_utils-1.3.1/malac/utils/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = "1.3.1"