Merge pull request #146 from mcode/develop

Merge develop for v1.1.0

Author: mgramigna

README.md

@@ -152,7 +152,9 @@ To mask a property, provide an array of the properties to mask in the `construct
 
 The mCODE Extraction Client will extract all data that is provided in the CSV files by default, regardless of any dates associated with each row of data. It is recommended that any required date filtering is performed outside of the scope of this client.
 
-If for any reason a user is required to specify a date range to be extracted through this client, users _must_ add a `dateRecorded` column in every data CSV file. This column will indicate when each row of data was added to the CSV file. Note that this date _does not_ correspond to any date associated with the data element.
+If for any reason a user is required to specify a date range to be extracted through this client, users _must_ add a `dateRecorded` column in every relevant data CSV file. This column will indicate when each row of data was added to the CSV file. Note that this date _does not_ correspond to any date associated with the data element.
+
+Note that some resources should always be included and should not be filtered out with a `dateRecorded` column and date. For example, every extraction should extract patient information to a Patient resource, so no `dateRecorded` column should be provided in a CSV that contains the Patient information.
 
 #### CLI From-Date and To-Date (NOT recommended use)
 
@@ -189,11 +191,11 @@ This framework consists of three key components: Extractors, Modules and Templat
 
 ### Glossary
 
-![Image detailing exact definitions of what is meant by Client, Extractor, Module and Template](./docs/diagrams/20_11_23_steam-terminology-breakdown.png)
+![Image detailing exact definitions of what is meant by Client, Extractor, Module and Template](./docs/diagrams/steam-terminology-breakdown.png)
 
 ### High Level Diagram
 
-![High-level architecture diagram, detailing exactly how Clients, Extractors, Modules, Templates and various web services communicate with one another](./docs/diagrams/20_11_23_steam-high-level-arch.png)
+![High-level architecture diagram, detailing exactly how Clients, Extractors, Modules, Templates and various web services communicate with one another](./docs/diagrams/steam-high-level-arch.png)
 
 These diagrams can be modified by updating the XML files in the `/docs/diagrams/` directory using draw.io or a company licensed equivalent.
 

…grams/20_11_23_steam-high-level-arch.png …chive/20_11_23_steam-high-level-arch.pngdocs/diagrams/20_11_23_steam-high-level-arch.png renamed to docs/diagrams/archive/20_11_23_steam-high-level-arch.png docs/diagrams/20_11_23_steam-high-level-arch.png renamed to docs/diagrams/archive/20_11_23_steam-high-level-arch.png

@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Safari/537.36" version="7.5.6" editor="www.draw.io" type="device"><diagram id="866f9370-945e-b958-1e14-63ab040b194e" name="Page-1">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</diagram></mxfile>

…grams/20_11_23_steam-high-level-arch.xml …chive/20_11_23_steam-high-level-arch.xmldocs/diagrams/20_11_23_steam-high-level-arch.xml renamed to docs/diagrams/archive/20_11_23_steam-high-level-arch.xml docs/diagrams/20_11_23_steam-high-level-arch.xml renamed to docs/diagrams/archive/20_11_23_steam-high-level-arch.xml

@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Safari/537.36" version="7.5.6" editor="www.draw.io" type="device"><diagram id="866f9370-945e-b958-1e14-63ab040b194e" name="Page-1">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</diagram></mxfile>