Skip to content

B
business-java
Commit a1fbd807 authored by sdhaul's avatar sdhaul
Browse files
Options

Changes in srvUserInfo service to get course history of the user. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199545 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a0bb8739
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 43 deletions
webitm-dashboard/ibase/dashboard/common/hibernate/dao/CourseDAO.java
View file @ a1fbd807
...@@ -5,7 +5,9 @@ import java.sql.Connection; ...@@ -5,7 +5,9 @@ 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.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -175,6 +177,57 @@ public class CourseDAO ...@@ -175,6 +177,57 @@ public class CourseDAO
return courseContentsArray; return courseContentsArray;
} }
public JSONObject getCourseContentsDetail(String courseCode)
{
System.out.println("getCourseContentsDetail of "+courseCode);
long contentsDuration = 0;
int videosCount = 0;
JSONObject contentDetails = new JSONObject();
try
{
String tranDB = this.userInfo.getTransDB();
List<CourseContent> courseContentList = getCourseContents(courseCode);
if( courseContentList !=null && !courseContentList.isEmpty() )
{
videosCount = courseContentList.size();
for( CourseContent courseContent : courseContentList )
{
String docId = getDocId(courseContent.getAttachment(), tranDB); // DOC_ID
DocContents docContents = getDocContents(docId, tranDB);
if( docContents != null )
{
String fileMetadata = checkNull(docContents.getFileMetadata());
try
{
JSONObject filemetadataJson = new JSONObject(fileMetadata);
String duration = filemetadataJson.getString("duration");
contentsDuration = contentsDuration + Long.parseLong(duration);
}
catch (Exception e)
{
System.out.println("Exception In CourseDAO" + e);
}
}
}
contentDetails.put("videos_count", videosCount);
contentDetails.put("total_duration", contentsDuration);
}
}
catch (Exception e)
{
BaseLogger.log("0", null, null, "Exception : getCourseContents::::::::: ");
BaseLogger.log("0", null, null, e.getMessage());
e.printStackTrace();
}
System.out.println("contentDetails in getCourseContentsDetail"+contentDetails);
return contentDetails;
}
private JSONArray getCourseQuestions(String courseCode) private JSONArray getCourseQuestions(String courseCode)
{ {
JSONArray courseQuestionsArray = new JSONArray(); JSONArray courseQuestionsArray = new JSONArray();
......
webitm-dashboard/ibase/dashboard/common/webService/CourseAPIService.java
View file @ a1fbd807
package ibase.dashboard.common.webService; package ibase.dashboard.common.webService;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -25,10 +27,13 @@ import org.json.JSONObject; ...@@ -25,10 +27,13 @@ import org.json.JSONObject;
import ibase.dashboard.common.hibernate.bean.Course; import ibase.dashboard.common.hibernate.bean.Course;
import ibase.dashboard.common.hibernate.bean.CourseAttend; import ibase.dashboard.common.hibernate.bean.CourseAttend;
import ibase.dashboard.common.hibernate.bean.CourseContent;
import ibase.dashboard.common.hibernate.bean.CourseContentAtt; import ibase.dashboard.common.hibernate.bean.CourseContentAtt;
import ibase.dashboard.common.hibernate.dao.CourseDAO; import ibase.dashboard.common.hibernate.dao.CourseDAO;
import ibase.dashboard.common.hibernate.dao.CustomerInfoDao;
import ibase.utility.BaseException; import ibase.utility.BaseException;
import ibase.utility.BaseLogger; import ibase.utility.BaseLogger;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
@Path("/api") @Path("/api")
...@@ -243,74 +248,102 @@ public class CourseAPIService ...@@ -243,74 +248,102 @@ public class CourseAPIService
//For Servgyan User Information Dashboard //For Servgyan User Information Dashboard
@GET @GET
@Path("/srvUserInfo/{userCode}") @Path("/srvUserInfo")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public String getSrvUserInfo(@PathParam("userCode") String userCode) throws Exception public String getSrvUserInfo(@QueryParam("user_id") String userCode) throws Exception
{ {
System.out.println("In getSrvUserInfo:: strgCode["+userCode+"]"); System.out.println("Inside srvUserInfo "+userCode );
JSONObject srvUserInfoObj = new JSONObject(); JSONObject srvUserInfoObj = new JSONObject();
JSONObject courseHistoryJson = new JSONObject();
JSONArray courseHistoryArray = new JSONArray();
UserInfoBean userInfo = getUserInfo(); UserInfoBean userInfo = getUserInfo();
String tranDb=""; String tranDb="";
String displayDateFormat;
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap<String, JSONObject> courseHistoryMap = new HashMap<String, JSONObject> ();
try try
{ {
if( userInfo != null ) if( userInfo != null && userCode != null )
{ {
tranDb=userInfo.getTransDB();
CourseDAO courseDao = new CourseDAO(); CourseDAO courseDao = new CourseDAO();
tranDb = userInfo.getTransDB();
displayDateFormat = genericUtility.getDispDateFormat();
courseDao.setUserInfo(userInfo); courseDao.setUserInfo(userInfo);
srvUserInfoObj = courseDao.getSrvUserInfoData(userCode); srvUserInfoObj = courseDao.getSrvUserInfoData(userCode);
JSONArray srvCourseDetArray = new JSONArray(); List<CourseAttend> courseAttendList = courseDao.getUserCourses(userCode,tranDb);
if(courseAttendList != null && !courseAttendList.isEmpty())
List<CourseAttend> courseContentList=courseDao.getUserCourses(userCode,tranDb); {
for( CourseAttend courseAttend : courseAttendList )
if(courseContentList != null && !courseContentList.isEmpty()) {
for( CourseAttend courseContent : courseContentList )
{ {
JSONObject courseDet=new JSONObject(); JSONObject courseContentJSON = new JSONObject();
String courseCode=courseContent.getCourseCode(); String courseCode = courseAttend.getCourseCode();
System.out.println("course code "+courseCode); Course course = courseDao.getCourse(courseCode);
if(courseCode != null) {
List<CourseContentAtt> courseContentDet= courseDao.getUserCourseContents(courseCode,userCode,tranDb); String courseName = course.getDescr();
if(courseContentDet != null && !courseContentDet.isEmpty()) { Date courseDate = course.getStartDate();
String courseDateStr = genericUtility.getValidDateTimeString(courseDate, displayDateFormat);
for( CourseContentAtt courseContDet : courseContentDet )
{ JSONObject courseContentDet = courseDao.getCourseContentsDetail(courseCode);
int videosCount = courseContentDet.optInt("videos_count");
String contentName=courseContDet.getContentName(); long contentsDuration = courseContentDet.optLong("total_duration");
String accessPos=courseContDet.getAccessPos();
String accessStat=courseContDet.getAcessStat();
Date lastAccessDate=courseContDet.getLastAccDate();
JSONObject courseContentJSON=new JSONObject();
courseContentJSON.put("CONTENT_NAME", contentName);
courseContentJSON.put("ACCESS_POS", accessPos);
courseContentJSON.put("ACCESS_STAT", accessStat);
courseContentJSON.put("LAST_ACCESS_DATE", lastAccessDate);
courseDet.put(courseCode, courseContentJSON);
System.out.println("OBJECT "+courseDet);
srvCourseDetArray.put(courseDet);
}
}
courseContentJSON.put("COURSE_ID", courseCode);
courseContentJSON.put("COURSE_NAME", courseName);
courseContentJSON.put("COURSE_DATE", courseDateStr);
courseContentJSON.put("COURSE_TIME_START", "");
courseContentJSON.put("COURSE_SUMMARY", "");
courseContentJSON.put("COURSE_DURATION", contentsDuration);
courseContentJSON.put("COURSE_VIDEOS_COUNT", videosCount);
JSONArray existingCourses = courseHistoryJson.optJSONArray(courseDateStr);
if(existingCourses == null)
{
existingCourses = new JSONArray();
} }
existingCourses.put(courseContentJSON);
courseHistoryJson.put(courseDateStr, existingCourses);
JSONObject courseHistoryDet = new JSONObject();
long totalCourseDuration = 0;
int totalCourses = 0;
int totalVideos = 0;
if(courseHistoryMap.containsKey(courseDateStr))
{
courseHistoryDet = courseHistoryMap.get(courseDateStr);
totalCourseDuration = courseHistoryDet.optLong("TOTAL_COURSE_DURATION");
totalCourses = courseHistoryDet.optInt("COURSES_COUNT");
totalVideos = courseHistoryDet.optInt("VIDEOS_COUNT");
}
totalCourseDuration = totalCourseDuration + contentsDuration;
totalCourses = totalCourses + 1;
totalVideos = totalVideos + videosCount;
courseHistoryDet.put("TOTAL_COURSE_DURATION", totalCourseDuration);
courseHistoryDet.put("COURSES_COUNT", totalCourses);
courseHistoryDet.put("VIDEOS_COUNT", totalVideos);
courseHistoryDet.put("COURSES", existingCourses);
courseHistoryMap.put(courseDateStr, courseHistoryDet);
} }
srvUserInfoObj.put("COURSE_DATA", srvCourseDetArray); for (String courseDate : courseHistoryMap.keySet())
{
JSONObject totalCourseHist = courseHistoryMap.get(courseDate);
courseHistoryArray.put(totalCourseHist);
}
srvUserInfoObj.put("COURSE_HISTORY", courseHistoryArray);
} }
} }
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
srvUserInfoObj.put("status", "Failure" ); srvUserInfoObj = new JSONObject();
srvUserInfoObj.put("status", "failure" );
} }
System.out.println("In getSrvUserInfo:: srvUserInfoObj["+srvUserInfoObj+"]");
return srvUserInfoObj.toString(); return srvUserInfoObj.toString();
} }
......
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