Skip to content

B
business-java
Commit 1f0f0ec7 authored by prumde's avatar prumde
Browse files
Options

Score and Rank related changes 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@214804 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3f6f69de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 146 deletions
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19IJOH007/leaderboard_abm.xml
View file @ 1f0f0ec7
......@@ -24,7 +24,7 @@
<mandatory><![CDATA[Y]]></mandatory>
</filter>
</filters>
<page_title><![CDATA[Leaderboard]]></page_title>
<page_title><![CDATA[ABM Leaderboard]]></page_title>
<datasource id="1" driverName="DriverITM" dataSourceType='datamodel'><![CDATA[LEADERBOARD_ABM_DM]]></datasource>
<view id="1" name="Default">
......@@ -61,7 +61,6 @@
display: inline-block;
font-size: 14px;
padding: 1px;
/*cursor: pointer;*/
width: calc(100% - 110px);
}
......@@ -99,31 +98,43 @@
.coachingPoint
{
text-align: right;
margin-right: 8px;
float: right;
/* position: absolute; */
/* right: 50px; */
}
.index
.rank-container
{
width: 30px;
padding: 0 4px 0 0;
}
.rank-number
{
min-width: 15px;
width: auto;
right: 0px;
position: relative;
height: 25px;
background-image: linear-gradient(-45deg, rgb(0, 123, 171), rgb(0, 201, 255));
border-radius: 12PX;
color: #fff;
line-height: 25px;
text-align: center;
padding: 0 5px;
font-size: 12px;
min-width: 15px;
width: auto;
right: 0px;
position: relative;
height: 20px;
color: var(--primary);
line-height: 25px;
font-weight: 700;
text-align: center;
padding: 0;
font-size: 12px;
}
.rank-text
{
text-align: center;
color: #91919c;
}
.truncate-text {
width: auto;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
<div style='max-height: auto; overflow: auto;'>
<div *ngFor="let userData of context; index as index;" style="padding: 0px 5px 0px;">
<div class="ext-dashboard">
<div *ngFor="let userData of context; index as index;" style="padding: 0px 5px 0px 0px;">
<ng-container *ngTemplateOutlet=" eventsTemplate; context:{ 'userData' : userData , 'index':index }"></ng-container>
</div>
</div>
......@@ -131,33 +142,35 @@
<ng-template #eventsTemplate let-userData = 'userData' let-index='index' >
<div class="feedData">
<div class="feedRow">
<div class="rank-container">
<div class="rank-number">{{userData.ESI_RANK}}</div>
<div class="rank-text">Rank</div>
</div>
<div style=" width: 38px; display: block;">
<img #img [src]= "_hostUrl+'/ibase/resource/images/users/' +userData.EMP_CODE.trim()+ '.png'"
<img #img [src]= "_hostUrl+'/ibase/resource/images/users/' +userData.EMP_CODE.trim()+ '.png'"
(error)="img.style.display='none'" class="userNameImg">
<div *ngIf="img.style.display==='none' && userData.EMP_NAME " class="userNameImg" >
{{userData.EMP_NAME.substring(0,1)}}{{ userData.EMP_NAME.trim().indexOf(' ') > 0 ?
userData.EMP_NAME.substring(userData.EMP_NAME.indexOf(' ')
+1,userData.EMP_NAME.indexOf(' ')+2) : userData.EMP_NAME.substring(1,2) }}
userData.EMP_NAME.substring( userData.EMP_NAME.indexOf(' ') + 1 ,
userData.EMP_NAME.indexOf(' ') + 2 ) : userData.EMP_NAME.substring(1,2) }}
</div>
</div>
<div class="nameDetails" title='{{userData.EMP_NAME}}'>
<div class=" userName componantTtl truncateText" style='position: relative; vertical-align: -webkit-baseline-middle;'>
{{userData.EMP_NAME}}
<div class="nameDetails" title='{{userData.POSITION_DESCR}}'>
<div class=" userName componantTtl truncate-text" style='position: relative; vertical-align: -webkit-baseline-middle;'>
{{userData.EMP_NAME}}<span style="color: #666; ">, {{userData.POSITION_DESCR}}</span>
</div>
<div style=" font-size: 12px; color: #666; " > {{ userData.POSITION_DESCR }} , {{ userData.LOCALITY }} </div>
<div style=" font-size: 12px; color: #666; "> {{userData.PERC}}% coaching performance</div>
</div>
<!--
<div class="countIndex">
<div class="coachingPoint"> {{ userData.COACHING_COUNT }}
<div class="coachingPoint"> {{ userData.PERC }}
</div>
<div class="index" >{{index+1}}</div>
</div>
-->
</div>
</div>
</ng-template> ]]>
......@@ -165,15 +178,23 @@
</layout>
<column_group id="1">
<columns>
<column id="1" type="number" aggFunction="SORT_BY" order="descending"><![CDATA[COACHING_COUNT]]></column>
<column id="1" type="number" aggFunction="SORT_BY" order="Ascending"><![CDATA[ESI_RANK]]></column>
</columns>
</column_group>
</component>
</view>
<!-- sample data
{"EMP_NAME":"SAMEER AHMED","LOCALITY":"CHENNAI","POSITION_DESCR":"ESI",
"CUST_COUNT":"0","EMP_CODE":"1002782 ","COACHING_COUNT":"0","REPORT_TO":"85348940 "} -->
{
"EMP_CODE": "8756 ",
"EMP_NAME": "KISHOR SARKAR",
"REPORT_TO": "9753 ",
"POSITION": "ESI",
"POSITION_DESCR": "ESI - FULL RANGE",
"TOT_YS": "3",
"TOT_QS": "3",
"PERC": "100",
"ESI_RANK": "1"
} -->
</Root>
......
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19IJOH007/leaderboard_esi.xml
View file @ 1f0f0ec7
......@@ -24,7 +24,7 @@
<mandatory><![CDATA[Y]]></mandatory>
</filter>
</filters>
<page_title><![CDATA[Leaderboard]]></page_title>
<page_title><![CDATA[ESI Leaderboard]]></page_title>
<datasource id="1" driverName="DriverITM" dataSourceType='datamodel'><![CDATA[LEADERBOARD_ESI_DM]]></datasource>
<view id="1" name="Default">
......@@ -61,7 +61,6 @@
display: inline-block;
font-size: 14px;
padding: 1px;
/*cursor: pointer;*/
width: calc(100% - 110px);
}
......@@ -99,31 +98,43 @@
.coachingPoint
{
text-align: right;
margin-right: 8px;
float: right;
/* position: absolute; */
/* right: 50px; */
}
.index
.rank-container
{
width: 30px;
padding: 0 4px 0 0;
}
.rank-number
{
min-width: 15px;
width: auto;
right: 0px;
position: relative;
height: 25px;
background-image: linear-gradient(-45deg, rgb(0, 123, 171), rgb(0, 201, 255));
border-radius: 12PX;
color: #fff;
line-height: 25px;
text-align: center;
padding: 0 5px;
font-size: 12px;
min-width: 15px;
width: auto;
right: 0px;
position: relative;
height: 20px;
color: var(--primary);
line-height: 25px;
font-weight: 700;
text-align: center;
padding: 0;
font-size: 12px;
}
.rank-text
{
text-align: center;
color: #91919c;
}
.truncate-text {
width: auto;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
<div style='max-height: auto; overflow: auto;'>
<div *ngFor="let userData of context; index as index;" style="padding: 0px 5px 0px;">
<div class="ext-dashboard">
<div *ngFor="let userData of context; index as index;" style="padding: 0px 5px 0px 0px;">
<ng-container *ngTemplateOutlet=" eventsTemplate; context:{ 'userData' : userData , 'index':index }"></ng-container>
</div>
</div>
......@@ -131,33 +142,34 @@
<ng-template #eventsTemplate let-userData = 'userData' let-index='index' >
<div class="feedData">
<div class="feedRow">
<div class="rank-container">
<div class="rank-number">{{userData.ESI_RANK}}</div>
<div class="rank-text">Rank</div>
</div>
<div style=" width: 38px; display: block;">
<img #img [src]= "_hostUrl+'/ibase/resource/images/users/' +userData.EMP_CODE.trim()+ '.png'"
<img #img [src]= "_hostUrl+'/ibase/resource/images/users/' +userData.EMP_CODE.trim()+ '.png'"
(error)="img.style.display='none'" class="userNameImg">
<div *ngIf="img.style.display==='none' && userData.EMP_NAME " class="userNameImg" >
{{userData.EMP_NAME.substring(0,1)}}{{ userData.EMP_NAME.trim().indexOf(' ') > 0 ?
userData.EMP_NAME.substring(userData.EMP_NAME.indexOf(' ')
+1,userData.EMP_NAME.indexOf(' ')+2) : userData.EMP_NAME.substring(1,2) }}
userData.EMP_NAME.substring( userData.EMP_NAME.indexOf(' ') + 1 ,
userData.EMP_NAME.indexOf(' ') + 2 ) : userData.EMP_NAME.substring(1,2) }}
</div>
</div>
<div class="nameDetails" title='{{userData.EMP_NAME}}'>
<div class=" userName componantTtl truncateText" style='position: relative; vertical-align: -webkit-baseline-middle;'>
{{userData.EMP_NAME}}
<div class="nameDetails" title='{{userData.POSITION_DESCR}}'>
<div class=" userName componantTtl truncate-text" style='position: relative; vertical-align: -webkit-baseline-middle;'>
{{userData.EMP_NAME}} <span style="color: #666; ">, {{userData.POSITION_DESCR}}</span>
</div>
<div style=" font-size: 12px; color: #666; " > {{ userData.POSITION_DESCR }} , {{ userData.LOCALITY }} </div>
<div style=" font-size: 12px; color: #666; "> {{userData.PERC}}% coaching performance</div>
</div>
<!--
<div class="countIndex">
<div class="coachingPoint"> {{ userData.COACHING_COUNT }}
<div class="coachingPoint"> {{ userData.PERC }}
</div>
<div class="index" >{{index+1}}</div>
</div>
</div>
-->
</div>
</div>
</ng-template> ]]>
......@@ -165,15 +177,23 @@
</layout>
<column_group id="1">
<columns>
<column id="1" type="number" aggFunction="SORT_BY" order="descending"><![CDATA[COACHING_COUNT]]></column>
<column id="1" type="number" aggFunction="SORT_BY" order="Ascending"><![CDATA[ESI_RANK]]></column>
</columns>
</column_group>
</component>
</view>
<!-- sample data
{"EMP_NAME":"SAMEER AHMED","LOCALITY":"CHENNAI","POSITION_DESCR":"ESI",
"CUST_COUNT":"0","EMP_CODE":"1002782 ","COACHING_COUNT":"0","REPORT_TO":"85348940 "} -->
{
"EMP_CODE": "8756 ",
"EMP_NAME": "KISHOR SARKAR",
"REPORT_TO": "9753 ",
"POSITION": "ESI",
"POSITION_DESCR": "ESI - FULL RANGE",
"TOT_YS": "3",
"TOT_QS": "3",
"PERC": "100",
"ESI_RANK": "1"
} -->
</Root>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment