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.

Sign up for GitHub

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

Refactor PDF config properties in QuestionnaireConfig #3498

Merged
merged 14 commits into from
Sep 27, 2024
Merged

Refactor PDF config properties in QuestionnaireConfig #3498

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c094f7
Refactor to use PdfConfig
FikriMilano Sep 13, 2024
eaa586a
Process multi QRs in HtmlPopulator
FikriMilano Sep 13, 2024
dd42646
Add new tag to check if Questionnaire has been submitted
FikriMilano Sep 13, 2024
1bea440
Remove subjectType since subjectReference is used
FikriMilano Sep 13, 2024
c9ae8fb
Fix test and spotless
FikriMilano Sep 13, 2024
bf8f581
Address review
FikriMilano Sep 17, 2024
c5aab3a
spotless
FikriMilano Sep 17, 2024
28b04d4
Merge branch 'main' of github.com:opensrp/fhircore into 3489-and-3490…
FikriMilano Sep 17, 2024
27fe6b7
Merge branch 'main' into 3489-and-3490-and-refactor-pdf-config
ellykits Sep 19, 2024
8fcf156
Merge branch 'main' into 3489-and-3490-and-refactor-pdf-config
FikriMilano Sep 26, 2024
bbea8c7
Cleanup
FikriMilano Sep 26, 2024
98fa24e
spotless
FikriMilano Sep 26, 2024
215e6e2
Fix test
FikriMilano Sep 26, 2024
b457f24
Merge branch 'main' into 3489-and-3490-and-refactor-pdf-config
FikriMilano Sep 26, 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
Prev Previous commit
Next Next commit
Add new tag to check if Questionnaire has been submitted
  • Loading branch information
@FikriMilano
FikriMilano committed Sep 13, 2024
commit dd426460c52f024915b73bfb3974e8bd933aa544
25 changes: 25 additions & 0 deletions android/engine/src/main/java/org/smartregister/fhircore/engine/pdf/HtmlPopulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ class HtmlPopulator(
val matcher = containsPattern.matcher(html.substring(i))
if (matcher.find()) processContains(i, html, matcher) else i++
}
html.startsWith("@is-questionnaire-submitted", i) -> {
val matcher = isQuestionnaireSubmittedPattern.matcher(html.substring(i))
if (matcher.find()) processIsQuestionnaireSubmitted(i, html, matcher) else i++
}
else -> i++
}
}
Expand Down Expand Up @@ -215,6 +219,25 @@ class HtmlPopulator(
}
}

/**
* Processes the @is-questionnaire-submitted tag by checking if the corresponding [QuestionnaireResponse] exists.
* Replaces the tag with the content if the indicator is true, otherwise removes the tag.
*
* @param i The starting index of the tag in the HTML.
* @param html The StringBuilder containing the HTML.
* @param matcher The Matcher object for the regex pattern.
*/
private fun processIsQuestionnaireSubmitted(i: Int, html: StringBuilder, matcher: Matcher) {
val id = matcher.group(1)
val content = matcher.group(2) ?: ""
val doesQuestionnaireExists = questionnaireIds.contains(id)
if (doesQuestionnaireExists) {
html.replace(i, matcher.end() + i, content)
} else {
html.replace(i, matcher.end() + i, "")
}
}

companion object {
// Compile regex patterns for different tags
private val isNotEmptyPattern =
Expand All @@ -224,5 +247,7 @@ class HtmlPopulator(
private val submittedDatePattern = Pattern.compile("@submitted-date\\('([^']+)'(?:,'([^']+)')?\\)")
private val containsPattern =
Pattern.compile("@contains\\('([^']+)','([^']+)'\\)((?s).*?)@contains\\('\\1'\\)")
private val isQuestionnaireSubmittedPattern =
Pattern.compile("@is-questionnaire-submitted\\('([^']+)'\\)((?s).*?)@is-questionnaire-submitted\\('\\1'\\)")
}
}
Loading