Skip to content

FLW-857: Fix age format display across all modules #342

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

Open
umaseershika45 wants to merge 2 commits into
base: release-2.8
Choose a base branch
from
Open

FLW-857: Fix age format display across all modules #342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0991e7
Age display logic updated for <6 years and >=6 years
umaseershika45 Mar 29, 2026
427a730
FLW-857: Apply age format logic to form-backed models
umaseershika45 Apr 3, 2026
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
40 changes: 7 additions & 33 deletions app/src/main/java/org/piramalswasthya/sakhi/model/Ben.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,56 +796,30 @@ fun getAgeDisplayString(dob: Long): String {
val calDob = Calendar.getInstance().apply { timeInMillis = dob }
val calNow = Calendar.getInstance()

val diffDays =
TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - dob).toInt()

if (diffDays < 31) {
return "$diffDays Day${if (diffDays != 1) "s" else ""}"
}

var years = calNow.get(Calendar.YEAR) - calDob.get(Calendar.YEAR)
var months = calNow.get(Calendar.MONTH) - calDob.get(Calendar.MONTH)
var days = calNow.get(Calendar.DAY_OF_MONTH) - calDob.get(Calendar.DAY_OF_MONTH)

if (days < 0) {
months -= 1
months--
val tempCal = calNow.clone() as Calendar
tempCal.add(Calendar.MONTH, -1)
days += tempCal.getActualMaximum(Calendar.DAY_OF_MONTH)
}

if (months < 0) {
years -= 1
years--
months += 12
}

return when {
years >= 1 -> {
buildString {
append("$years Year${if (years != 1) "s" else ""}")
if (months >= 1) {
append(" $months Month${if (months != 1) "s" else ""}")
}
if (days >= 1) {
append(" $days Day${if (days != 1) "s" else ""}")
}
}
}
else -> {
buildString {
if (months >= 1) {
append("$months Month${if (months != 1) "s" else ""}")
}
if (days >= 1) {
append(" $days Day${if (days != 1) "s" else ""}")
}
}
}
return if (years < 6) {
"$years Years $months Months $days Days"
} else {
"$years Years"
}
}



@Parcelize
data class BenBasicDomain(
val benId: Long,
Expand Down Expand Up @@ -924,7 +898,7 @@ data class BenBasicDomainForForm(
val dob: Long,
val ageInt: Int = getAgeFromDob(dob),
val ageUnit: AgeUnit = getAgeUnitFromDob(dob),
val age: String = "$ageInt $ageUnit",
val age: String = "${getAgeDisplayString(dob)}",
val mobileNo: String,
val fatherName: String? = null,
val spouseName: String? = null,
Expand Down