Skip to content

Change Application Disposition Model to Payment Model view #21

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
CodeByAyoub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change Application Disposition Model to Payment Model view #21

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
29 changes: 15 additions & 14 deletions application/core_al_time_model_column.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<xsl:variable name="linkClasses" select="('Business_Capability', 'Application_Provider')"></xsl:variable>
<!-- END GENERIC LINK VARIABLES -->

<xsl:variable name="timeVals" select="/node()/simple_instance[type = ('Disposition_Lifecycle_Status')]"></xsl:variable>
<!--<xsl:variable name="apps" select="/node()/simple_instance[type = ('Application_Provider', 'Composite_Application_Provider')][own_slot_value[slot_reference = 'ap_disposition_lifecycle_status']/value = $timeVals/name]"></xsl:variable>
<!-- Changed to Payment Models instead of Disposition Lifecycle Status -->
<xsl:variable name="timeVals" select="/node()/simple_instance[type = ('Revenue_Model', 'Charging_Model')]"></xsl:variable>
<!--<xsl:variable name="apps" select="/node()/simple_instance[type = ('Application_Provider', 'Composite_Application_Provider')][own_slot_value[slot_reference = 'ap_revenue_model']/value = $timeVals/name]"></xsl:variable>
-->
<xsl:variable name="styles" select="/node()/simple_instance[type = ('Element_Style')]"></xsl:variable>
<!-- ***REQUIRED*** DETERMINE IF ANY RELEVANT INSTANCES ARE ROADMAP ENABLED -->
Expand Down Expand Up @@ -70,7 +71,7 @@
<xsl:with-param name="targetMenu" select="()"></xsl:with-param>
</xsl:call-template>
</xsl:for-each>
<title>Application Disposition Model</title>
<title>Application Payment Model</title>
<style>
.ess-tag-dotted {
border: 2px dashed #222;
Expand Down Expand Up @@ -164,7 +165,7 @@
<h1>
<span class="text-primary"><xsl:value-of select="eas:i18n('View')"></xsl:value-of>: </span>
<span class="text-darkgrey">
<xsl:value-of select="eas:i18n('Application Disposition Model')"></xsl:value-of>
<xsl:value-of select="eas:i18n('Application Payment Model')"></xsl:value-of>
</span>
</h1>
</div>
Expand Down Expand Up @@ -241,7 +242,7 @@
<!-- ADD THE PAGE FOOTER -->
<xsl:call-template name="Footer"></xsl:call-template>
</body>
<script id="disposition-template" type="text/x-handlebars-template"></script>
<script id="paymentmodel-template" type="text/x-handlebars-template"></script>
<script>
var timeJSON = [<xsl:apply-templates select="$timeVals" mode="timeJSON"><xsl:sort select="current()/own_slot_value[slot_reference='enumeration_sequence_number']/value" order="ascending"/></xsl:apply-templates>];
var applications;
Expand Down Expand Up @@ -362,17 +363,17 @@
return new ScopingProperty(filterdef.slotName, filterdef.valueClass)
});

var dispostionFragment = $("#disposition-template").html();
var dispostionTemplate = Handlebars.compile(dispostionFragment);
var paymentModelFragment = $("#paymentmodel-template").html();
var paymentModelTemplate = Handlebars.compile(paymentModelFragment);
applications=workingArray;

timeJSON.forEach((d)=>{
let appList = applications.applications.filter((e)=>{
return d.id == e.dispositionId;
});
return d.id == e.paymentModelId;
});
let currentCol= d.colour;
appList.forEach((e)=>{
e['colour']=currentCol;
appList.forEach((e)=>{
e['colour']=currentCol;
})

d['apps']=appList;
Expand Down Expand Up @@ -442,11 +443,11 @@
console.log('sa', scopedApps.resources)
timeJSON.forEach((d)=>{
let appList = scopedApps.resources.filter((e)=>{
return d.id == e.dispositionId;
return d.id == e.paymentModelId;
});
let currentCol= d.colour;
appList.forEach((e)=>{
e['colour']=currentCol;
appList.forEach((e)=>{
e['colour']=currentCol;
})

d['apps']=appList;
Expand Down