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

Add StructureMap tool code #16

Merged
merged 58 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
c77969a
Add StructureMap tool code
ekigamba Aug 15, 2023
d9d4b0b
Code cleanup
ekigamba Aug 15, 2023
6c25eb4
Add todos for final structuremap presentation
ekigamba Aug 23, 2023
9872d72
Fix entity variable in StructureMap generation
ekigamba Aug 23, 2023
f7f3374
Fix resourceType inference on the StructureMap tool
ekigamba Aug 23, 2023
23ef706
Fix bugs and add TODOs
ekigamba Aug 29, 2023
b3eff53
Skip assignments with empty literals during smap generation
ekigamba Aug 29, 2023
85dda85
Fix property assignment from QR nested items
ekigamba Aug 29, 2023
3851188
Draft commit: :hammer:
ekigamba Aug 29, 2023
6cbe843
Draft commit: :hammer:
ekigamba Aug 29, 2023
a7eaca0
Merge remote-tracking branch 'origin/add-structure-map-tooling' into …
sharon2719 Sep 7, 2023
be99b20
Convert literal to datatypes (#60)
sharon2719 Oct 2, 2023
527bcd2
Merge remote-tracking branch 'origin/add-structure-map-tooling' into …
sharon2719 Oct 5, 2023
f80dd8b
Merge branch 'main' into add-structure-map-tooling
pld Nov 2, 2023
2b37221
change root folder
pld Nov 2, 2023
7833f06
Merge branch 'main' into add-structure-map-tooling
pld Nov 2, 2023
716f3f7
Merge branch 'main' into add-structure-map-tooling
pld Nov 10, 2023
a3afb5a
Add questionnaire response path extraction
brandyodhiambo Dec 13, 2023
fe64e5f
Merge pull request #88 from onaio/file-path-read
sharon2719 Dec 13, 2023
44bc23c
Merge branch 'main' into add-structure-map-tooling
SebaMutuku Dec 13, 2023
e30bfa0
modified old xls
brandyodhiambo Dec 13, 2023
3df304d
fix old xls not showing structure map
brandyodhiambo Dec 13, 2023
09116ca
fix old sm patient not generating text sm
brandyodhiambo Dec 18, 2023
e18e2ba
edit entering of file path to file name
brandyodhiambo Dec 18, 2023
cc7ba4d
modified old xls
brandyodhiambo Dec 20, 2023
ecdf14d
Merge branch 'old-xls-bug-fix' of https://github.com/onaio/fhir-tooli…
brandyodhiambo Dec 20, 2023
6f0440b
Merge pull request #96 from onaio/old-xls-bug-fix
sharon2719 Dec 21, 2023
42397e3
Merge branch 'main' into add-structure-map-tooling
SebaMutuku Jan 18, 2024
e7d24a8
validates the questionnaire response item id
brandyodhiambo Jan 25, 2024
ac08b8d
Write a json file for the generated .map file
Lentumunai-Mark Jan 26, 2024
bbefcb8
validates the resource name.
brandyodhiambo Jan 26, 2024
59d61d7
validates the resource name.
brandyodhiambo Jan 26, 2024
a081e65
Merge pull request #113 from onaio/write-Json/map-files
sharon2719 Jan 31, 2024
fd49b74
edits the resource name validation
brandyodhiambo Jan 31, 2024
ddec33f
Merge branch 'add-structure-map-tooling' into questionnair-response-i…
brandyodhiambo Jan 31, 2024
bf30414
fixes merge conflicts
brandyodhiambo Jan 31, 2024
a30608e
Merge pull request #114 from onaio/questionnair-response-item-id-vali…
brandyodhiambo Jan 31, 2024
9b2b644
Clean up
sharon2719 Feb 1, 2024
40a2020
Merge branch 'main' into add-structure-map-tooling
SebaMutuku Feb 2, 2024
1b9d8a4
Merge branch 'main' into add-structure-map-tooling
f-odhiambo Feb 2, 2024
6b89d2c
fix resource name validation for generatingGroup function
brandyodhiambo Feb 6, 2024
3a3d30f
fix resource name validation for generatingGroup function
brandyodhiambo Feb 7, 2024
33836f9
Merge branch 'main' into add-structure-map-tooling
brandyodhiambo Feb 7, 2024
789d829
adding the xls
brandyodhiambo Feb 7, 2024
bcbb449
Merge pull request #131 from onaio/reference-for-generated-resources
sharon2719 Feb 7, 2024
c3d2004
setting ref up
brandyodhiambo Mar 19, 2024
7311445
provide reference for generated resource WIP
brandyodhiambo Mar 27, 2024
deb0c7e
edit sm xls
brandyodhiambo Mar 27, 2024
48fd1d5
completes reference generation for a given resource
brandyodhiambo Mar 28, 2024
840afbd
traces why observation reference is not generated
brandyodhiambo Apr 2, 2024
ad014c2
include resource to reference on xls
brandyodhiambo Apr 2, 2024
b686a7c
include encounter
brandyodhiambo Apr 2, 2024
9dac4c2
include patient
brandyodhiambo Apr 2, 2024
2caf987
add second option to reference resource
brandyodhiambo Apr 2, 2024
40a7687
removes wild card import and revert file back the file input
brandyodhiambo Apr 3, 2024
71b5a93
minor fixes
brandyodhiambo Apr 3, 2024
a3ca86f
Merge pull request #180 from onaio/reference-for-generated-resources
brandyodhiambo Apr 4, 2024
2c3b820
Merge branch 'main' into add-structure-map-tooling
pld Jun 12, 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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ A repo to hold our FHIR content and configuration creation tools and scripts.
- [cleaner](https://github.com/onaio/fhircore-tooling/tree/main/cleaner)
- [efsity](https://github.com/onaio/fhircore-tooling/tree/main/efsity)
- [importer](https://github.com/onaio/fhircore-tooling/tree/main/importer)
- [sm-gen](https://github.com/onaio/fhircore-tooling/tree/main/sm-gen)
- [uploader](https://github.com/onaio/fhircore-tooling/tree/main/uploader)

## License
Expand Down
8 changes: 8 additions & 0 deletions sm-gen/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
build/
**/build
.idea/
.gradle/
generated-structure-map.txt
generated-json-map.txt
generated-json-map.json
.~lock.StructureMap XLS.xlsx#
55 changes: 55 additions & 0 deletions sm-gen/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.gradle.jvm.tasks.Jar

plugins {
kotlin("jvm") version "1.6.21"
}

group = "org.example"
version = "1.0-SNAPSHOT"

repositories {
mavenCentral()
}

dependencies {
testImplementation(kotlin("test"))
implementation("com.github.ajalt.clikt:clikt:3.4.0")
implementation("org.apache.poi:poi:3.17")
implementation("org.apache.poi:poi-ooxml:3.17")
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:5.4.0")
implementation("ca.uhn.hapi.fhir:hapi-fhir-validation:5.4.0")
implementation(kotlin("stdlib-jdk8"))
}

tasks.test {
useJUnitPlatform()
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}

val fatJar = task("fatJar", type = Jar::class) {
baseName = "${project.name}-fat"
// manifest Main-Class attribute is optional.
// (Used only to provide default main class for executable jar)
manifest {
attributes["Main-Class"] = "example.HelloWorldKt" // fully qualified class name of default main class
}
from(configurations.compileClasspath.get().map({ if (it.isDirectory) it else zipTree(it) }))
with(tasks["jar"] as CopySpec)
}

tasks {
"build" {
dependsOn(fatJar)
}
}

kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
}
}

1 change: 1 addition & 0 deletions sm-gen/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kotlin.code.style=official
Binary file added sm-gen/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions sm-gen/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
234 changes: 234 additions & 0 deletions sm-gen/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################

# Attempt to set APP_HOME

# Resolve links: $0 may be a link
app_path=$0

# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

warn () {
echo "$*"
} >&2

die () {
echo
echo "$*"
echo
exit 1
} >&2

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi

# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

JAVACMD=$( cygpath --unix "$JAVACMD" )

# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#

eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
Loading
Loading