Skip to content

Commit

Permalink
Fix licence filtering and PCF (to match amounts) (#270)
Browse files Browse the repository at this point in the history 
* Fix licence filtering and PCF (to match amounts)

* update version

* Fix Base funding amounts
  • Loading branch information
@pallvigrover
pallvigrover authored Nov 8, 2024
1 parent 15b29ff commit f021610
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 71 deletions.
12 changes: 8 additions & 4 deletions OFM.Application.WebResources/Scripts/FormHandler/ofm_Application.Form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,18 @@ OFM.Application.Form = {
var facilityId = formContext.getAttribute("ofm_facility").getValue() ? formContext.getAttribute("ofm_facility").getValue()[0].id : null;
var submittedOnDate = formContext.getAttribute("ofm_summary_submittedon").getValue();
if (submittedOnDate != null) {
submittedOnDate.setMinutes(submittedOnDate.getMinutes() - submittedOnDate.getTimezoneOffset());
var date = submittedOnDate.toISOString();
}
else
var date = formContext.getAttribute("createdon").getValue() != null ?
formContext.getAttribute("createdon").getValue().toISOString() : new Date();
else {
var createdOn = formContext.getAttribute("createdon").getValue() != null ?
formContext.getAttribute("createdon").getValue() : new Date();
createdOn.setMinutes(createdOn.getMinutes() - createdOn.getTimezoneOffset());
var date = createdOn.toISOString();
}
if (facilityId != null) {
var conditionFetchXML = "";
Xrm.WebApi.retrieveMultipleRecords("ofm_licence", "?$select=ofm_licence&$filter=(_ofm_facility_value eq " + facilityId + " and statecode eq 0 and ((ofm_end_date eq null and Microsoft.Dynamics.CRM.OnOrBefore(PropertyName='ofm_start_date',PropertyValue='" + date + "')) or (Microsoft.Dynamics.CRM.OnOrAfter(PropertyName='ofm_end_date',PropertyValue='" + date + "') and Microsoft.Dynamics.CRM.OnOrBefore(PropertyName='ofm_start_date',PropertyValue='" + date + "'))))").then(
Xrm.WebApi.retrieveMultipleRecords("ofm_licence", "?$select=ofm_licence&$filter=((_ofm_facility_value eq " + facilityId + " and statecode eq 0 and ofm_start_date le " + date + ") or (ofm_end_date eq null and ofm_end_date ge " + date + "))").then(
function success(results) {
console.log(results);
if (results.entities.length > 0) {
Expand Down
62 changes: 34 additions & 28 deletions OFM.Infrastructure.PCF/Controls/FundingEnvelope/FundingEnvelope/ControlManifest.Input.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest>
<control namespace="ECC.PCF" constructor="FundingEnvelopeControl" version="0.0.13" display-name-key="FundingEnvelope" description-key="FundingEnvelope description" control-type="virtual">
<control namespace="ECC.PCF" constructor="FundingEnvelopeControl" version="0.0.24" display-name-key="FundingEnvelope" description-key="FundingEnvelope description" control-type="virtual">
<!--external-service-usage node declares whether this 3rd party PCF control is using external service or not, if yes, this control will be considered as premium and please also add the external domain it is using.
If it is not using any external service, please set the enabled="false" and DO NOT add any domain below. The "enabled" will be false by default.
Example1:
Expand All @@ -19,33 +19,39 @@
</external-service-usage>
<!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
<property name="field0" display-name-key="field0_key" description-key="Binding field on the target MDA form." of-type="SingleLine.Text" usage="bound" required="true" />
<property name="field1" display-name-key="field1_key" description-key="Wages_Paid Time Off" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field2" display-name-key="field2_key" description-key="Wages_Paid Time Off (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field3" display-name-key="field3_key" description-key="Wages_Paid Time Off (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field4" display-name-key="field4_key" description-key="Benefits" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field5" display-name-key="field5_key" description-key="Benefits (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field6" display-name-key="field6_key" description-key="Benefits (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field7" display-name-key="field7_key" description-key="Employer Health Tax" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field8" display-name-key="field8_key" description-key="Employer Health Tax (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field9" display-name-key="field9_key" description-key="Employer Health Tax (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field10" display-name-key="field10_key" description-key="Professional Development Hours" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field11" display-name-key="field11_key" description-key="Professional Development Hours (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field12" display-name-key="field12_key" description-key="Professional Development Hours (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field13" display-name-key="field13_key" description-key="Professional Development Expenses" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field14" display-name-key="field14_key" description-key="Professional Development Expenses (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field15" display-name-key="field15_key" description-key="Professional Development Expenses (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field16" display-name-key="field16_key" description-key="Programming" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field17" display-name-key="field17_key" description-key="Programming (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field18" display-name-key="field18_key" description-key="Programming (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field19" display-name-key="field19_key" description-key="Administrative" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field20" display-name-key="field20_key" description-key="Administrative (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field21" display-name-key="field21_key" description-key="Administrative (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field22" display-name-key="field22_key" description-key="Operational" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field23" display-name-key="field23_key" description-key="Operational (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field24" display-name-key="field24_key" description-key="Operational (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field25" display-name-key="field25_key" description-key="Facility" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field26" display-name-key="field26_key" description-key="Facility (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field27" display-name-key="field27_key" description-key="Facility (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field1" display-name-key="field1_key" description-key="Instructional Human Resources" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field2" display-name-key="field2_key" description-key="Instructional Human Resources (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field3" display-name-key="field3_key" description-key="Instructional Human Resources (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field4" display-name-key="field4_key" description-key="Wages_Paid Time Off" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field5" display-name-key="field5_key" description-key="Wages_Paid Time Off (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field6" display-name-key="field6_key" description-key="Wages_Paid Time Off (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field7" display-name-key="field7_key" description-key="Benefits" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field8" display-name-key="field8_key" description-key="Benefits (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field9" display-name-key="field9_key" description-key="Benefits (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field10" display-name-key="field10_key" description-key="Employer Health Tax" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field11" display-name-key="field11_key" description-key="Employer Health Tax (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field12" display-name-key="field12_key" description-key="Employer Health Tax (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field13" display-name-key="field13_key" description-key="Professional Development Hours" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field14" display-name-key="field14_key" description-key="Professional Development Hours (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field15" display-name-key="field15_key" description-key="Professional Development Hours (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field16" display-name-key="field16_key" description-key="Professional Development Expenses" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field17" display-name-key="field17_key" description-key="Professional Development Expenses (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field18" display-name-key="field18_key" description-key="Professional Development Expenses (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field19" display-name-key="field19_key" description-key="Programming" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field20" display-name-key="field20_key" description-key="Programming (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field21" display-name-key="field21_key" description-key="Programming (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field22" display-name-key="field22_key" description-key="Administrative" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field23" display-name-key="field23_key" description-key="Administrative (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field24" display-name-key="field24_key" description-key="Administrative (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field25" display-name-key="field25_key" description-key="Operational" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field26" display-name-key="field26_key" description-key="Operational (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field27" display-name-key="field27_key" description-key="Operational (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field28" display-name-key="field28_key" description-key="Facility" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field29" display-name-key="field29_key" description-key="Facility (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field30" display-name-key="field30_key" description-key="Facility (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field31" display-name-key="field31_key" description-key="Total" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field32" display-name-key="field32_key" description-key="Total (PF)" of-type="Currency" usage="bound" required="true" default-value="0" />
<property name="field33" display-name-key="field33_key" description-key="Total (Projected)" of-type="Currency" usage="bound" required="true" default-value="0" />
<!--
Property node's of-type attribute can be of-type-group attribute.
Example:
Expand Down
Loading

0 comments on commit f021610

Please sign in to comment.