Chnages for trending courses

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200500 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/hibernate/dao/CourseDAO.java

@@ -109,6 +109,64 @@ public class CourseDAO
 		return courseArray;
 	}
 	
+	/// For Trending courses
+		public JSONArray getCourseTrendingData(List<String> courseCodeList) 
+		{
+			JSONArray courseArray = new JSONArray();
+			try 
+			{
+				System.out.println("Inside try of getCourseTrendingData");
+				String tranDB = this.userInfo.getTransDB();
+				String loginCode = this.userInfo.getLoginCode();
+				Map<String, BigDecimal> course = getCourseListTrendingData(loginCode);
+				for (String courseCode : courseCodeList) 
+				{
+					BigDecimal courseCount = course.get(courseCode);
+					if (courseCount != null) 
+					{
+						Course courseData = getCourse(courseCode);
+						System.out.println("Inside for of getCourseTrendingData");
+						System.out.println("course data for getCourseTrendingData==>" + courseCount);
+						JSONObject courseObj = new JSONObject();
+
+						String courseStatus = "O"; // Trending Courses 
+						
+						JSONArray courseContents = getCourseContents(courseCode, courseStatus);
+						JSONArray courseQuestions = getCourseQuestions(courseCode);
+
+						String courseSubDescr = getCourseSubDescr(courseData.getCourseSub(), tranDB);
+						String descr = getCourseSubDescr(courseData.getDescr(), tranDB);
+
+						courseObj.put("courseSubDescr", courseSubDescr);
+						courseObj.put("descr", descr);
+						courseObj.put("courseContents", courseContents);
+						courseObj.put("courseQuestions", courseQuestions);
+						courseObj.put("courseWatchCount", courseCount);
+						courseObj.put("courseCode", courseCode);
+						courseObj.put("courseStatus", "T");
+
+						BaseLogger.log("3", null, null, " getUserCourseData courseObj ::::" + courseObj);
+						courseArray.put(courseObj);
+					}
+
+				}
+			} 
+			catch (JSONException e) 
+			{
+				BaseLogger.log("0", null, null, "JSONException : getUserCourseData ");
+				BaseLogger.log("0", null, null, e.getMessage());
+				e.printStackTrace();
+			} 
+			catch (Exception e) 
+			{
+				BaseLogger.log("0", null, null, "Exception : getUserCourseData ");
+				BaseLogger.log("0", null, null, e.getMessage());
+				e.printStackTrace();
+			}
+			return courseArray;
+		}
+
+		///kamal
 	private JSONArray getCourseContents(String courseCode, String courseStatus) 
 	{
 		JSONArray courseContentsArray = new JSONArray();
@@ -283,60 +341,7 @@ public class CourseDAO
 		return courseQuestionsArray;
 	}
 
-	/// For Trending courses
-	public JSONArray getCourseTrendingData(List<String> courseCodeList) 
-	{
-		JSONArray courseArray = new JSONArray();
-		try 
-		{
-			System.out.println("Inside try of getCourseTrendingData");
-			String tranDB = this.userInfo.getTransDB();
-			String loginCode = this.userInfo.getLoginCode();
-			Map<String, BigDecimal> course = getCourseListTrendingData(loginCode);
-			for (String courseCode : courseCodeList) 
-			{
-				BigDecimal courseCount = course.get(courseCode);
-				if (courseCount != null) 
-				{
-					Course courseData = getCourse(courseCode);
-					System.out.println("Inside for of getCourseTrendingData");
-					System.out.println("course data for getCourseTrendingData==>" + courseCount);
-					JSONObject courseObj = new JSONObject();
-
-					String courseStatus = "O"; // Open Courses - Yet to visit
-
-					JSONArray courseContents = getCourseContents(courseCode, courseStatus);
-					JSONArray courseQuestions = getCourseQuestions(courseCode);
-
-					String courseSubDescr = getCourseSubDescr(courseData.getCourseSub(), tranDB);
-					String descr = getCourseSubDescr(courseData.getDescr(), tranDB);
-
-					courseObj.put("courseSubDescr", courseSubDescr);
-					courseObj.put("descr", descr);
-					courseObj.put("courseContents", courseContents);
-					courseObj.put("courseQuestions", courseQuestions);
-					courseObj.put("courseWatchCount", courseCount);
-
-					BaseLogger.log("3", null, null, " getUserCourseData courseObj ::::" + courseObj);
-					courseArray.put(courseObj);
-				}
-
-			}
-		} 
-		catch (JSONException e) 
-		{
-			BaseLogger.log("0", null, null, "JSONException : getUserCourseData ");
-			BaseLogger.log("0", null, null, e.getMessage());
-			e.printStackTrace();
-		} 
-		catch (Exception e) 
-		{
-			BaseLogger.log("0", null, null, "Exception : getUserCourseData ");
-			BaseLogger.log("0", null, null, e.getMessage());
-			e.printStackTrace();
-		}
-		return courseArray;
-	}
+	
 
 	// Selection of Data from Master Tables Start
 	public Course getCourse(String courseCode)