Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev wg devicealert sd #2996

Draft
wants to merge 51 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6e4f3dc
first devicealert changes
rhoadsj Jun 21, 2023
0af8e20
files to generate spreadsheet
ElliotSilver Jun 21, 2023
e53d271
Merge branch 'master' into dev-wg-devicealert
rhoadsj Aug 2, 2023
ee2bf08
save changes, some dubious
rhoadsj Sep 6, 2023
c5a2fe7
oops add fhir.ini
rhoadsj Sep 6, 2023
a0cb06a
Merge branch 'master' of https://github.com/HL7/fhir into dev-wg-devi…
rhoadsj Sep 6, 2023
5946157
deleted excess .xml files
rhoadsj Oct 4, 2023
6419cd9
lots of changes in master
rhoadsj Nov 13, 2023
3225db1
various adds based on build error messages
rhoadsj Dec 4, 2023
9e965e9
added changes to source/resourcelist.html and source/resourceguide.html
rhoadsj Dec 4, 2023
4e03a07
Merge branch 'master' of https://github.com/HL7/fhir into dev-wg-devi…
rhoadsj Dec 4, 2023
02a26a5
remove duplicate entries
ElliotSilver Dec 6, 2023
e1e4af2
Merge branch 'master' into dev-wg-devicealert-sd
grahamegrieve Dec 6, 2023
9e93d70
DeviceAlert fixes
ElliotSilver Dec 7, 2023
cf69c32
comment out in-progress DeviceAlert content
ElliotSilver Dec 7, 2023
1d5c5c2
first devicealert changes
rhoadsj Jun 21, 2023
9e2ce9f
files to generate spreadsheet
ElliotSilver Jun 21, 2023
4faaf46
save changes, some dubious
rhoadsj Sep 6, 2023
2f69f74
oops add fhir.ini
rhoadsj Sep 6, 2023
8464305
deleted excess .xml files
rhoadsj Oct 4, 2023
09adadb
various adds based on build error messages
rhoadsj Dec 4, 2023
5ee6b3d
added changes to source/resourcelist.html and source/resourceguide.html
rhoadsj Dec 4, 2023
a667d07
remove duplicate entries
ElliotSilver Dec 6, 2023
2ed35b8
DeviceAlert fixes
ElliotSilver Dec 7, 2023
b033fb2
comment out in-progress DeviceAlert content
ElliotSilver Dec 7, 2023
539a974
devicealert valuesets (1)
ElliotSilver Dec 10, 2023
54ff5b5
Merge branch 'dev-wg-devicealert-sd' of https://github.com/HL7/fhir i…
ElliotSilver Dec 10, 2023
64413a7
DeviceAlert codesystems (2)
ElliotSilver Dec 10, 2023
77fde3d
DeviceAlert searchparams
ElliotSilver Dec 11, 2023
0de5a2d
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Dec 11, 2023
d1d4e52
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Dec 11, 2023
d55a090
fix devicealert errors
ElliotSilver Dec 11, 2023
3a401f4
DeviceAlert fmm level updates
ElliotSilver Dec 11, 2023
29bed52
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Dec 13, 2023
13a47c4
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Dec 13, 2023
30f8cb1
DeviceAlert - assorted cleanup, resource extensions
ElliotSilver Dec 14, 2023
1e66528
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Dec 18, 2023
d14110d
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Jan 12, 2024
1605863
DeviceAlert isModifier reasons
ElliotSilver Jan 29, 2024
75e0c14
Merge branch 'master' into dev-wg-devicealert-sd
ElliotSilver Jan 30, 2024
e692cb3
poke
ElliotSilver Jan 30, 2024
835248c
Added DeviceAlert mappings
ElliotSilver Jan 31, 2024
95de517
Merge branch 'master' into dev-wg-devicealert-sd
rhoadsj Feb 28, 2024
da2db74
introduction change, structure definition little change
rhoadsj Feb 28, 2024
caac127
misc. cleanup unwanted files
rhoadsj Mar 27, 2024
ddc1c6f
Merge branch 'master' into dev-wg-devicealert-sd
rhoadsj Mar 27, 2024
62cb5c2
Merge branch 'master' of https://github.com/HL7/fhir into dev-wg-devi…
rhoadsj Mar 29, 2024
591a4e2
javier introduction work partially added. oid problem not solved
rhoadsj Apr 1, 2024
9a50c75
added more text to devicealert-introduction.xml
rhoadsj Apr 3, 2024
22d531c
Merge branch 'master' into dev-wg-devicealert-sd
rhoadsj Apr 3, 2024
ad2872f
test change to intro
rhoadsj Jun 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.~*
*.gen.svg
*.bck
newProject.xpr
holder.txt
/schema/*.xsd
/schema/codegen
Expand Down Expand Up @@ -380,4 +381,4 @@ gradle-app.setting
source/patient/Patient-rendering.liquid.x

# VS Code local settings
.vscode/
.vscode/
33 changes: 33 additions & 0 deletions 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
SLF4J: No SLF4J providers were found.
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See https://www.slf4j.org/codes.html#noProviders for further details.
SLF4J: Class path contains SLF4J bindings targeting slf4j-api versions 1.7.x or earlier.
SLF4J: Ignoring binding found at [jar:file:/Users/jrhoads/.gradle/caches/modules-2/files-2.1/org.hl7.fhir/kindling/1.9.1-SNAPSHOT/b50fbebf87f7f2a86bed1c87439a0265ca903acd/kindling-1.9.1-SNAPSHOT-all.jar!/org/slf4j/impl/StaticLoggerBinder.class]
SLF4J: See https://www.slf4j.org/codes.html#ignoredBindings for an explanation.
Type error at char 1 in xsl:apply-templates/@select on line 14 column 70
XTTE0570: An empty sequence is not allowed as the value of variable $groups
in global variable $groups (#13)
Error
SXXP0003: Error reported by XML parser: Premature end of file.
java.lang.Exception: Errors executing build. Details logged.
at org.hl7.fhir.tools.publisher.Publisher.checkAllOk(Publisher.java:2579)
at org.hl7.fhir.tools.publisher.Publisher.validate(Publisher.java:2565)
at org.hl7.fhir.tools.publisher.Publisher.execute(Publisher.java:803)
at org.hl7.fhir.tools.publisher.Publisher.main(Publisher.java:583)

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':publish'.
> Process 'command '/usr/local/Cellar/openjdk@17/17.0.9/libexec/openjdk.jdk/Contents/Home/bin/java'' finished with non-zero exit value 1

* Try:
> Run with --stacktrace option to get the stack trace.
> Run with --debug option to get more log output.
> Run with --scan to get full insights.

* Get more help at https://help.gradle.org

BUILD FAILED in 1m
Empty file modified build.sh
100644 → 100755
Empty file.
Empty file modified clean.sh
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions implementations/translations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@
<translation lang="es">Dispositivo</translation>
<translation lang="zh">装置</translation>
</item>
<item id="DeviceAlert">
<translation lang="en">DeviceAlert</translation>
</item>
<item id="DeviceAssociation">
<translation lang="en">DeviceAssociation</translation>
</item>
Expand Down
2 changes: 2 additions & 0 deletions publish.ini
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,8 @@ BiologicallyDerivedProduct = Base.Entities
Device = Base.Entities
DeviceComponent = Base.Entities
DeviceMetric = Base.Entities
DeviceAlert = Base.Entities
DeviceAssociation = Base.Entities
Task = Base.Workflow
Appointment = Base.Workflow
AppointmentResponse = Base.Workflow
Expand Down
Empty file modified publish.sh
100644 → 100755
Empty file.
7 changes: 7 additions & 0 deletions runit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
# runs gradle on core build and captures sysout and syserr output in file with timestamp in front
DATEFILE='%Y-%m-%d-%H%m'
FILENAME=$(date +$DATEFILE)-build.log
echo $FILENAME
./gradlew publish --info 2>1 |tee $FILENAME

9 changes: 7 additions & 2 deletions source/compartments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</WorksheetOptions>
</Worksheet>
<Worksheet ss:Name="resources">
<Table ss:ExpandedColumnCount="6" ss:ExpandedRowCount="175" ss:StyleID="s65" x:FullColumns="1" x:FullRows="1">
<Table ss:ExpandedColumnCount="6" ss:ExpandedRowCount="176" ss:StyleID="s65" x:FullColumns="1" x:FullRows="1">
<Column ss:AutoFitWidth="0" ss:StyleID="s65" ss:Width="158.0"/>
<Column ss:AutoFitWidth="0" ss:StyleID="s65" ss:Width="198.0"/>
<Column ss:AutoFitWidth="0" ss:StyleID="s65" ss:Width="98.0"/>
Expand Down Expand Up @@ -339,6 +339,11 @@
<Row ss:AutoFitHeight="0">
<Cell><Data ss:Type="String">Device</Data></Cell>
</Row>
<Row ss:AutoFitHeight="0">
<Cell><Data ss:Type="String">DeviceAlert</Data></Cell>
<Cell><Data ss:Type="String">subject</Data></Cell>
<Cell ss:Index="6"><Data ss:Type="String">subject | source | annunciator-device</Data></Cell>
</Row>
<Row ss:AutoFitHeight="0">
<Cell><Data ss:Type="String">DeviceAssociation</Data></Cell>
<Cell><Data ss:Type="String">subject | operator</Data></Cell>
Expand Down Expand Up @@ -899,7 +904,7 @@
<FreezePanes/>
<FrozenNoSplit/>
<SplitHorizontal>1</SplitHorizontal>
<TopRowBottomPane>69</TopRowBottomPane>
<TopRowBottomPane>42</TopRowBottomPane>
<ActivePane>2</ActivePane>

<ProtectObjects>False</ProtectObjects>
Expand Down
Loading