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
Cleanup
  • Loading branch information
@FikriMilano
FikriMilano committed Sep 26, 2024
commit bbea8c7cae9acf73dcaf0d5fc239051a864b2b82
6 changes: 3 additions & 3 deletions android/quest/src/main/java/org/smartregister/fhircore/quest/ui/pdf/PdfLauncherViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ constructor(
* Retrieve the [QuestionnaireResponse] for the given questionnaire and subject.
*
* @param questionnaireId The ID of the questionnaire.
* @param subjectReference The ID of the subject.
* @param subjectReference The reference of the subject e.g. Patient/123.
* @return The [QuestionnaireResponse] if found, otherwise null.
*/
suspend fun retrieveQuestionnaireResponse(
questionnaireId: String,
subjectReference: String,
): QuestionnaireResponse? {
val searchQuery =
createQuestionnaireResponseSearchQuery(questionnaireId, subjectId, subjectType)
createQuestionnaireResponseSearchQuery(questionnaireId, subjectReference)
return defaultRepository.search<QuestionnaireResponse>(searchQuery).maxByOrNull {
it.meta.lastUpdated
}
Expand All @@ -62,7 +62,7 @@ constructor(
* Create a search query for [QuestionnaireResponse].
*
* @param questionnaireId The ID of the questionnaire.
* @param subjectReference The ID of the subject.
* @param subjectReference The reference of the subject e.g. Patient/123.
* @return The search query for [QuestionnaireResponse].
*/
private fun createQuestionnaireResponseSearchQuery(
Expand Down