Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.labkey.onprc_billing.dataentry.ChargesARTCoreFormType;
import org.labkey.onprc_billing.dataentry.ReversalFormType;
import org.labkey.onprc_billing.notification.BillingValidationNotification;
import org.labkey.onprc_billing.notification.DCMFinanceNotification;
import org.labkey.onprc_billing.notification.FinanceNotification;
import org.labkey.onprc_billing.pipeline.BillingPipelineProvider;
import org.labkey.onprc_billing.query.BillingAuditProvider;
Expand Down Expand Up @@ -119,7 +118,6 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
PipelineService.get().registerPipelineProvider(new BillingPipelineProvider(this));

NotificationService.get().registerNotification(new FinanceNotification());
NotificationService.get().registerNotification(new DCMFinanceNotification());
NotificationService.get().registerNotification(new BillingValidationNotification());

EHRService.get().registerTableCustomizer(this, ONPRC_BillingCustomizer.class);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.labkey.api.query.QueryService;
import org.labkey.api.query.UserSchema;
import org.labkey.api.security.User;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.onprc_billing.ONPRC_BillingManager;
import org.labkey.onprc_billing.ONPRC_BillingModule;
import org.labkey.onprc_billing.ONPRC_BillingSchema;
Expand Down Expand Up @@ -429,7 +430,7 @@ protected void writeResultTable(final StringBuilder msg, Date lastInvoiceEnd, Ca
Container container = containerMap.get(category);

String url = getExecuteQueryUrl(container, ONPRC_BillingSchema.NAME, categoryToQuery.get(category), null) + "&query.param.StartDate=" + getDateFormat(c).format(start.getTime()) + "&query.param.EndDate=" + getDateFormat(c).format(endDate.getTime());
msg.append("<tr><td><a href='" + url + "'>" + category + "</a></td><td>" + totalsMap.get("total") + "</td><td>" + _dollarFormat.format(totalsMap.get("totalCost")) + "</td></tr>");
msg.append("<tr><td><a href='" + PageFlowUtil.filter(url) + "'>" + PageFlowUtil.filter(category) + "</a></td><td>" + totalsMap.get("total") + "</td><td>" + _dollarFormat.format(totalsMap.get("totalCost")) + "</td></tr>");
}
msg.append("</table><br><br>");

Expand Down Expand Up @@ -474,8 +475,8 @@ protected void writeResultTable(final StringBuilder msg, Date lastInvoiceEnd, Ca

String baseUrl = getExecuteQueryUrl(containerMap.get(category), ONPRC_BillingSchema.NAME, categoryToQuery.get(category), null) + "&query.param.StartDate=" + getDateFormat(c).format(start.getTime()) + "&query.param.EndDate=" + getDateFormat(c).format(endDate.getTime());
String projUrl = baseUrl + ("None".equals(tokens[1]) ? "&query.project/displayName~isblank" : "&query.project/displayName~eq=" + tokens[1]);
msg.append("<tr><td>" + financialAnalyst + "</td>"); //the FA
msg.append("<td><a href='" + projUrl + "'>" + tokens[1] + "</a></td>");
msg.append("<tr><td>" + PageFlowUtil.filter(financialAnalyst) + "</td>"); //the FA
msg.append("<td><a href='" + PageFlowUtil.filter(projUrl) + "'>" + PageFlowUtil.filter(tokens[1]) + "</a></td>");

//alias
String accountUrl = null;
Expand All @@ -487,22 +488,22 @@ protected void writeResultTable(final StringBuilder msg, Date lastInvoiceEnd, Ca

if (accountUrl != null)
{
msg.append("<td><a href='" + accountUrl + "'>" + tokens[2] + "</a></td>");
msg.append("<td><a href='" + PageFlowUtil.filter(accountUrl) + "'>" + PageFlowUtil.filter(tokens[2]) + "</a></td>");
}
else
{
msg.append("<td>" + (tokens[2]) + "</td>");
msg.append("<td>" + PageFlowUtil.filter(tokens[2]) + "</td>");
}

msg.append("<td>" + (tokens[3]) + "</td>");
msg.append("<td>" + category + "</td>");
msg.append("<td>" + PageFlowUtil.filter(tokens[3]) + "</td>");
msg.append("<td>" + PageFlowUtil.filter(category) + "</td>");

for (FieldDescriptor fd : foundCols)
{
if (totals.containsKey(fd.getFieldName()))
{
String url = projUrl + fd.getFilter();
msg.append("<td" + (fd.isShouldHighlight() ? " style='background-color: yellow;'" : "") + "><a href='" + url + "'>" + totals.get(fd.getFieldName()) + "</a></td>");
msg.append("<td" + (fd.isShouldHighlight() ? " style='background-color: yellow;'" : "") + "><a href='" + PageFlowUtil.filter(url) + "'>" + totals.get(fd.getFieldName()) + "</a></td>");
}
else
{
Expand Down