Commit 6e61a2ac authored by nsawalakhe's avatar nsawalakhe

add two static parameter for different colour creation


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101585 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d3b51193
...@@ -174,6 +174,7 @@ public class ChartCreator ...@@ -174,6 +174,7 @@ public class ChartCreator
/*end By Swati for Parent Axis Attribute*/ /*end By Swati for Parent Axis Attribute*/
} }
int cnt=0; int cnt=0;
int localCount=0;
if (jsonObjGraph != null) if (jsonObjGraph != null)
{ {
cnt++; cnt++;
...@@ -234,6 +235,7 @@ public class ChartCreator ...@@ -234,6 +235,7 @@ public class ChartCreator
} }
} }
valueMapSet = allDataMap.keySet(); valueMapSet = allDataMap.keySet();
if(chartTypeList.get(0).trim().equals("bar")) if(chartTypeList.get(0).trim().equals("bar"))
{ {
for (String keyString : valueMapSet) for (String keyString : valueMapSet)
...@@ -371,7 +373,7 @@ public class ChartCreator ...@@ -371,7 +373,7 @@ public class ChartCreator
graphJson.put("categories", categryJson); graphJson.put("categories", categryJson);
} }
else if(chartTypeList.get(0).trim().equals("pie")) else if(chartTypeList.get(0).trim().equals("pie"))
{ {
cnt = 0; cnt = 0;
for (String keyString : valueMapSet) for (String keyString : valueMapSet)
{ {
...@@ -387,6 +389,20 @@ public class ChartCreator ...@@ -387,6 +389,20 @@ public class ChartCreator
categoryMap.put(new JSONString("color"), new JSONString("85C2FF")); categoryMap.put(new JSONString("color"), new JSONString("85C2FF"));
} }
/*End color for pie chart for compliance Dashboard JNJ by Dhanendra 16Jun2015*/ /*End color for pie chart for compliance Dashboard JNJ by Dhanendra 16Jun2015*/
//Note: This is exception case we have add two static parameter for colouring purpose on dated:4-May-2016
if(keyString.contains("Marks"))
{
categoryMap.put(new JSONString("color"), new JSONString("85C2FF"));
}
else if(keyString.contains("Remaining"))
{
categoryMap.put(new JSONString("color"), new JSONString("FFB84D"));
}
//Note: End This is exception case we have add two static parameter for colouring purpose on dated:4-May-2016
/*Add Code for tooltext by Dhanendra on 30-06-15*/ /*Add Code for tooltext by Dhanendra on 30-06-15*/
if(toolTextDataList.size()>0) if(toolTextDataList.size()>0)
{ {
......
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