Skip to content

Commit

Permalink
Merge pull request #2 from mortenoh/dev-local-template
Browse files Browse the repository at this point in the history
fix: build error fix. Add dhis2 template
  • Loading branch information
mortenoh authored Sep 8, 2023
2 parents dda731c + 1e0c84e commit a55d686
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 57 deletions.
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Temporary folders #
#####################
temp
template
output
fsh-generated

# Don't commit this because it's so large #
###########################################
/input-cache

# Windows generated files #
###########################
Thumbs.db

# OS generated files #
######################
.DS_Store
.DS_Store?

# backup files #
################
*.bak
/local-template/package/**/.index.json
6 changes: 3 additions & 3 deletions input/fsh/models/hivprogram.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ Logical: HIVFollowUp

Logical: HIVView

* CaseReport 0..1 HIVCaseData
* Visit 0..*
* FollowUp
* CaseReport 0..1 HIVCaseData ""
* Visit 0..* date ""
* FollowUp 0..* date ""

* dateHIVPositiveTest 1..1 date "Date of documented positive HIV test"
* typeOfTesting 0..1 Coding "Type of community-level testing"
Expand Down
2 changes: 1 addition & 1 deletion input/fsh/profiles/hivcondition.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Parent: Observation

Extension: FacilityLevelTestingEntryPoint
Id: FacilityLevelTestingEntryPoint
Title: ""
Title: "Facility Level Testing Entry Point"
Description: "Facility Level Testing Entry Point."
* value[x] only Coding
//* valueCoding from ValueSetXXXXX // This is how we will add the valueset
10 changes: 5 additions & 5 deletions input/fsh/profiles/patient.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ Description: "DHIS2 HIV sPatient profile"

* extension contains
PatientSexAtBirth named patientSexAtBirth 1..1 and
HIVEnrollmentOrgUnit named hivEnrollmentOrgUnit 0..1
keyPopGroup named keyPopGroup 0..*
HIVEnrollmentOrgUnit named hivEnrollmentOrgUnit 0..1 and
KeyPopGroup named keyPopGroup 0..*

Extension: PatientSexAtBirth
Id: PatientSexAtBirth
Title: ""
Title: "Patient Sex at Birth"
Description: "Sex at Birth."
* value[x] only boolean


Extension: HIVEnrollmentOrgUnit
Id: HIVEnrollmentOrgUnit
Title: ""
Title: "HIV Enrollment Organization Unit"
Description: "Current Enrollment Org Unit."
* value[x] only Reference(OrgUnitOrganization)


Extension: KeyPopGroup
Id: KeyPopGroup
Title: ""
Title: "Key Population Group"
Description: "Key Pop group."
* value[x] only Coding
83 changes: 40 additions & 43 deletions local-template/package/content/assets/css/colors.css
Original file line number Diff line number Diff line change
@@ -1,45 +1,42 @@
:root {

/* see http://build.fhir.org/ig/FHIR/ig-guidance/colors.html */

--ig-status-text-color: #333333; /* 1. IG Title and status text color */
--navbar-bg-color: #1f4d2e; /* 2. Header container color */
--footer-container-bg-color: #1f4d2e; /* 4. Footer container color */
--stripe-bg-color: #668877; /* 5. Header strip color */

--btn-hover-color: #33804a; /* 6. Menu button hover color */
--btn-active-color: #43a862; /* 7. Menu button active color */
--btn-text-color: #e6e6e6; /* 8. Menu button text color */
--btn-gradient-start-color: #33aa77; /* 9. Menu item gradient start color */
--btn-gradient-end-color: #209966; /* 10. Menu item gradient end color */
--btn-gradient-start-color-alpha: #ff33aa77; /* 11. Menu item gradient start color (with alpha) */
--btn-gradient-end-color-alpha: #ff209966; /* 12. Menu item gradient end color (with alpha) */
--link-color: #24d160; /* 13. Hyperlink text color */
--link-hover-color: #109030; /* 14. Hyperlink text hover color */

--publish-box-bg-color: yellow; /* 15. Publish box background color */
--publish-box-border: 1px solid green; /* 16. Publish box border definition */

--toc-box-bg-color: #ffeb7e; /* 17. TOC box background color */
--toc-box-border: 1px solid green; /* 18. TOC box border definition */

--stu-note-background-color: #fff2ff; /* 19. (STU) Note box background color */
--stu-note-border-left-color: #ff6020; /* 20. (STU) Note box border color */

--ig-header-color: #f5f5f5; /* 21. Header color (sides) */
--ig-header-container-color: #ffffff; /* 22. Header container color (center) */
--footer-nav-bg-color: #f5f5f5; /* 23. Footer navigation background color*/

--footer-bg-color: #666e68; /* 3. Footer background color*/
--footer-text-color: #ffffff; /* 24. Footer highlight font color */
--footer-hyperlink-text-color: #81BEF7; /* 25. Footer hyperlinks font color */
--footer-highlight-text-color: #ffff77; /* 26. Footer highlight font color */

--breadcrumb-bg-color: #f5f5f5; /* 27. Breadcrumb font color */
--breadcrumb-text-color: ##555555; /* 28. Breadcrumb font color */

--dragon-background-color: #fffbf7; /* 29. Dragon background color */
--dragon-text-color: #101020; /* 30. Dragon font color */

}

--ig-status-text-color: #3a3b3d; /* 1. IG Title and status text color */
--navbar-bg-color: #0c70b2; /* 2. Header container color */
--footer-bg-color: #707070; /* 3. Footer background color*/
--footer-container-bg-color: #212934; /* 4. Footer container color */
--stripe-bg-color: #999999; /* 5. Header strip color */

--btn-hover-color: #1b547a; /* 6. Menu button hover color */
--btn-active-color: #4eb3f7; /* 7. Menu button active color */
--btn-text-color: #e8eaed; /* 8. Menu button text color */
--btn-gradient-start-color: #428bca; /* 9. Menu item gradient start color */
--btn-gradient-end-color: #357ebd; /* 10. Menu item gradient end color */
--btn-gradient-start-color-alpha: #ff428bca; /* 11. Menu item gradient start color (with alpha) */
--btn-gradient-end-color-alpha: #ff357ebd; /* 12. Menu item gradient end color (with alpha) */
--link-color: #428bca; /* 13. Hyperlink text color */
--link-hover-color: #2a6496; /* 14. Hyperlink text hover color */

--publish-box-bg-color: #ffff00; /* 15. Publish box background color */
--publish-box-border: 1px solid #0A0008; /* 16. Publish box border definition */

--toc-box-bg-color: #ffeb7e; /* 17. TOC box background color */
--toc-box-border: 1px solid navy; /* 18. TOC box border definition */

--stu-note-background-color: #fff2ff; /* 19. (STU) Note box background color */
--stu-note-border-left-color: #ffa0ff; /* 20. (STU) Note box border color */

--ig-header-color: #f5f5f5; /* 21. Header color (sides) */
--ig-header-container-color: #ffffff; /* 22. Header container color (center) */

--footer-nav-bg-color: #f5f5f5; /* 23. Footer navigation background color*/
--footer-text-color: #ffffff; /* 24. Footer highlight font color */
--footer-hyperlink-text-color: #81BEF7; /* 25. Footer hyperlinks font color */
--footer-highlight-text-color: #ffff77; /* 26. Footer highlight font color */

--breadcrumb-bg-color: #f5f5f5; /* 27. Breadcrumb font color */
--breadcrumb-text-color: ##555555; /* 28. Breadcrumb font color */

--dragon-background-color: #fffbf7; /* 29. Dragon background color */
--dragon-text-color: #101020; /* 30. Dragon font color */

}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion local-template/package/includes/_append.fragment-css.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- Placeholder for child template CSS declarations -->
<link href="{{site.data.info.assets}}assets/css/colors.css" rel="stylesheet"/>
<link href="{{site.data.info.assets}}assets/css/colors.css" rel="stylesheet"/>
19 changes: 19 additions & 0 deletions local-template/package/includes/fragment-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-- Left logo - typically the publisher's logo - project or affiliate -->
<div id="project-nav">
<a id="project-logo" no-external="true" href="https://dhis2.org/integration/fhir/">
<img height="60" alt="Project home" src="{{site.data.info.assets}}assets/images/dhis2.png"/>
</a>
</div>

<!-- Right logo - for example the FHIR logo -->
<!-- Make sure you have authorization to use the FHIR logo -->
<div id="family-nav">
<a id="family-logo" no-external="true" href="http://hl7.org/fhir"><img height="80" alt="FHIR website" src="{{site.data.info.assets}}assets/images/fhir.png"/> </a>
</div>

<!-- search icon - if you want -->
<!--
<div id="hl7-search">
<a id="hl7-search-lnk" no-external="true" href="http://hl7.org/fhir/search.cfm"><img alt="Search FHIR" src="{{site.data.info.assets}}assets/images/search.png"/></a>
</div>
-->
8 changes: 4 additions & 4 deletions local-template/package/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "myorg.fhir.mytemplate",
"name": "hl7.fhir.be.my.template",
"version": "0.0.1",
"type": "fhir.template",
"license": "CC0-1.0",
"description": "Local template extension for FHIR IG",
"author": "http://hl7belgium.org",
"base": "openhie.fhir.template",
"base": "hl7.be.fhir.template",
"dependencies": {
"openhie.fhir.template": "current"
"hl7.be.fhir.template": "current"
}
}
}

0 comments on commit a55d686

Please sign in to comment.