Commit af41b7de authored by kpandey's avatar kpandey

Changes for landing page dashboard

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@202590 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b2a70a0d
...@@ -6,6 +6,7 @@ import java.sql.Connection; ...@@ -6,6 +6,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -39,7 +40,9 @@ import ibase.webitm.ejb.DocumentHandlerWrapperEJB; ...@@ -39,7 +40,9 @@ import ibase.webitm.ejb.DocumentHandlerWrapperEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
public class CourseDAO public class CourseDAO
{ {
...@@ -81,6 +84,21 @@ public class CourseDAO ...@@ -81,6 +84,21 @@ public class CourseDAO
courseObj.put("courseStatus", courseStatus); // Open Courses - Yet to visit courseObj.put("courseStatus", courseStatus); // Open Courses - Yet to visit
} }
String daysRemaining = "0";
try
{
Date date1 = course.getEndDate();
Date date2 = new Date();
long diff = date1.getTime() - date2.getTime();
daysRemaining = Long.toString( TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS) );
System.out.println ("Days to go : " + daysRemaining);
}
catch (Exception e)
{
e.printStackTrace();
}
courseObj.put("daysToGo", daysRemaining);
JSONArray courseContents = getCourseContents(courseCode, courseStatus); JSONArray courseContents = getCourseContents(courseCode, courseStatus);
JSONArray courseQuestions = getCourseQuestions(courseCode); JSONArray courseQuestions = getCourseQuestions(courseCode);
......
...@@ -25,6 +25,7 @@ import org.hibernate.query.NativeQuery; ...@@ -25,6 +25,7 @@ import org.hibernate.query.NativeQuery;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.json.JSONTokener;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
...@@ -66,6 +67,7 @@ public class DashboardUtil ...@@ -66,6 +67,7 @@ public class DashboardUtil
private String userSite; private String userSite;
//To fetch empCode of user //To fetch empCode of user
private String empCode; private String empCode;
private String profileId;
public JSONObject getDashboardConfig(String dashboardFileName,UserInfoBean userInfo) public JSONObject getDashboardConfig(String dashboardFileName,UserInfoBean userInfo)
{ {
...@@ -77,6 +79,7 @@ public class DashboardUtil ...@@ -77,6 +79,7 @@ public class DashboardUtil
userTranDB =userInfo.getTransDB(); userTranDB =userInfo.getTransDB();
userSite =userInfo.getSiteCode(); userSite =userInfo.getSiteCode();
empCode = userInfo.getEmpCode(); empCode = userInfo.getEmpCode();
profileId = userInfo.getProfileId();
} }
System.out.println("userTranDB =" + userTranDB); System.out.println("userTranDB =" + userTranDB);
CommonConstants.setIBASEHOME(); CommonConstants.setIBASEHOME();
...@@ -280,6 +283,31 @@ public class DashboardUtil ...@@ -280,6 +283,31 @@ public class DashboardUtil
System.out.println(e.getMessage()); System.out.println(e.getMessage());
} }
} }
else if(dataSourceType.equalsIgnoreCase("jsondata")) {
try
{
JSONObject valueObj = new JSONObject(value);
JSONArray quicklinks = valueObj.optJSONArray("quicklinks");
JSONArray quicklinksFinal=new JSONArray();
for(int i = 0, size = quicklinks.length(); i < size; i++) {
JSONObject quicklinkObj=quicklinks.optJSONObject(i);
String objName = quicklinkObj.getString("obj_name_rights");
if( objName != null )
{
String displayLink = getObjUserRights(objName, profileId);
quicklinkObj.put("displayLink", displayLink);
}
quicklinksFinal.put(quicklinkObj);
}
valueObj.put("quicklinks", quicklinksFinal);
datasourceObj.put("value",valueObj.toString() );
}
catch (JSONException e)
{
e.printStackTrace();
}
}
} }
...@@ -1117,7 +1145,7 @@ public class DashboardUtil ...@@ -1117,7 +1145,7 @@ public class DashboardUtil
} }
/* DONE FOR DISPLAYING DASHBOARD BASED ON OBJ_RIGHTS */ /* DONE FOR DISPLAYING DASHBOARD BASED ON OBJ_RIGHTS */
private String getObjUserRights(String objNameRights, String profileId) throws SQLException private String getObjUserRights(String objNameRights, String profileId)
{ {
String display = "Y"; String display = "Y";
List<Object>resultList = new ArrayList<Object>(); List<Object>resultList = new ArrayList<Object>();
......
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