WebSVN – SmartDukaan – Diff – /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

     public String getFormattedDate(Date date){
     	return sdf.format(date);
+    }
-    public Map<Long, Double> getScores() throws Exception{
+    public Map<String, Double> getScores() throws Exception{
     	Long entityId = Long.parseLong(this.id);
+    	Map<String,Double> finalScores = new HashMap<String, Double>();
     	EntityState es = CreationUtils.getEntityState(entityId);
     	if (es!=null && es.getCategoryID() > 0) {
 	    	if((es.getCategoryID() == 10002l || es.getCategoryID() == 10003l || es.getCategoryID() == 10004l || es.getCategoryID() == 10005l) && !es.getStatus().equals(EntityStatus.UNASSIGNED)){
 		    	NewCMP cmp = new NewCMP(Arrays.asList(this.entity));
-		    	Map<Long, Double> score = null;
 				try {
+					//get Scores on the basis of evaluation
 					Map<Long, Map<Long, Double>> scoreMap = cmp.getSlideScores(0);
+					finalScores.put("actual", cmp.getFinalScores(scoreMap).get(entityId)/10);
+					Map<Long, Double> customScores = CreationUtils.getCustomSlideComparisonScores(entityId);
+					if(customScores != null){
+						//now update scoreMap if any of the slide score has been customised
+						for (Map.Entry<Long, Double> entry : scoreMap.get(entityId).entrySet()){
+							if(customScores.containsKey(entry.getKey())){
-					score = scoreMap.get(entityId);
+								entry.setValue(customScores.get(entry.getKey()));
+							}
+						}
-					score.put(130054L, cmp.getFinalScores(scoreMap).get(entityId)/10);
+						finalScores.put("custom", cmp.getFinalScores(scoreMap).get(entityId)/10);
+					}
 				} catch (Exception e) {
 					System.out.println("Some error occurred");
 					e.printStackTrace();
+				}
 				DecimalFormat oneDForm = new DecimalFormat("#.#");
-				for(Map.Entry<Long, Double> scoreEntry : score.entrySet()){
+				for(Map.Entry<String, Double> scoreEntry : finalScores.entrySet()){
 					scoreEntry.setValue(Double.valueOf(oneDForm.format(scoreEntry.getValue())));
+				}
-				return score;
+				return finalScores;
 	    	} else {
-	    		return new HashMap<Long, Double>();
+	    		return new HashMap<String, Double>();
+	    	}
     	} else {
-    		return new HashMap<Long, Double>();
+    		return new HashMap<String, Double>();
+    	}
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java – Rev 7975 → 8024