Skip to content

Changes to delivery progress text for each payment unit #3007

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

Merged
OrangeAndGreen merged 1 commit into from
Apr 2, 2025
Merged

Changes to delivery progress text for each payment unit #3007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 7 additions & 25 deletions app/src/org/commcare/fragments/connect/ConnectDeliveryProgressDeliveryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,11 @@ public void setDeliveriesData() {
if (job != null) {
List<ConnectDeliveryDetails> deliveryProgressList = new ArrayList<>();
HashMap<String, HashMap<String, Integer>> paymentTypeAndStatusCounts = new HashMap<>();
int totalApproved = 0;
int totalPending = 0;
String totalAmount;
long daysRemaining;
ConnectJobDeliveryRecord delivery = null;

if (!job.getDeliveries().isEmpty()) {
// Loop through each delivery and count statuses
for (int i = 0; i < job.getDeliveries().size(); i++) {
delivery = job.getDeliveries().get(i);
ConnectJobDeliveryRecord delivery = job.getDeliveries().get(i);
if (delivery == null) {
continue;
}
Expand All @@ -150,22 +145,21 @@ public void setDeliveriesData() {
HashMap<String, Integer> statusCounts = paymentTypeAndStatusCounts.containsKey(unitIdKey) ? paymentTypeAndStatusCounts.get(unitIdKey) : new HashMap<>();

// Get pending and approved counts
totalPending = statusCounts.containsKey("pending") ? statusCounts.get("pending") : 0;
totalApproved = statusCounts.containsKey("approved") ? statusCounts.get("approved") : 0;
int totalApproved = statusCounts.containsKey("approved") ? statusCounts.get("approved") : 0;
Copy link
Contributor

@pm-dimagi pm-dimagi Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think taking key "approved" as constant value

int remaining = unit.getMaxTotal() - totalApproved;

// Calculate the total amount for this delivery (numApproved * unit amount)
totalAmount = job.getMoneyString(totalApproved * unit.getAmount());
String totalAmount = job.getMoneyString(totalApproved * unit.getAmount());

// Calculate remaining days for the delivery
daysRemaining = calculateDaysPending(delivery);
long daysRemaining = job.getDaysRemaining();

int totalStatus = totalPending + totalApproved;
double approvedPercentage = totalStatus > 0 ? (double) totalApproved / totalStatus * 100 : 0.0;
double approvedPercentage = unit.getMaxTotal() > 0 ? (double) totalApproved / unit.getMaxTotal() * 100 : 0.0;
connectDeliveryDetails = new ConnectDeliveryDetails();
connectDeliveryDetails.setUnitId(unit.getUnitId());
connectDeliveryDetails.setDeliveryName(unit.getName());
connectDeliveryDetails.setApprovedCount(totalApproved);
connectDeliveryDetails.setPendingCount(totalPending);
connectDeliveryDetails.setPendingCount(remaining);
connectDeliveryDetails.setRemainingDays(daysRemaining);
connectDeliveryDetails.setTotalAmount(totalAmount);
connectDeliveryDetails.setApprovedPercentage(approvedPercentage);
Expand All @@ -182,16 +176,4 @@ public void setDeliveriesData() {
}
}
}

private long calculateDaysPending(ConnectJobDeliveryRecord delivery) {
Date dueDate = delivery.getDate();
if (dueDate == null) {
return 0;
}
long currentTime = System.currentTimeMillis();
long dueTime = dueDate.getTime();
long timeDifference = dueTime - currentTime;
long daysPending = TimeUnit.MILLISECONDS.toDays(timeDifference);
return Math.max(0, daysPending);
}
}