WebSVN – SmartDukaan – Diff – //trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js

 var TEAM_ACTIVITY = ["COMMUNICATION_OUT", "COMMUNICATION_INTERNAL",
 	"ESCALATED", "ASSIGNED", "CATEGORY_CHANGED"];
+// Activity type constants for consistent usage
+var ActivityType = {
+	OPENED: "OPENED",
+	COMMUNICATION_IN: "COMMUNICATION_IN",
+	COMMUNICATION_OUT: "COMMUNICATION_OUT",
+	COMMUNICATION_INTERNAL: "COMMUNICATION_INTERNAL",
+	RESOLVED: "RESOLVED",
+	RESOLVED_ACCEPTED: "RESOLVED_ACCEPTED",
+	RESOLVED_REJECTED: "RESOLVED_REJECTED",
+	ESCALATED: "ESCALATED",
+	ASSIGNED: "ASSIGNED",
+	CATEGORY_CHANGED: "CATEGORY_CHANGED"
+};
+// Helper function to normalize boolean values from various sources
+function toBool(val) {
+	return val === true || val === "true";
+}
+// Helper function to escape HTML and prevent XSS
+function escapeHtml(text) {
+	if (text == null) return '';
+	var div = document.createElement('div');
+	div.textContent = text;
+	return div.innerHTML;
+}
 $(function() {
 	$(document).on('click', ".create-ticket-category", function() {
 		console.log("create ticket category clicked......");
 		loadCreateCategory("main-content");
 	$(document).on('click', "#activities", function() {
 		var ticketId = $(this).data('ticketid');
 		var assignee = $(this).data('assignee');
 		var internal = $(this).data('internal');
 		var roleType = $(this).data('role');
+		var isCrmUser = $(this).data('crm');
 		console.log(assignee);
-		loadActivities(ticketId, assignee, internal, roleType);
+		loadActivities(ticketId, assignee, internal, roleType, isCrmUser);
 	});
 	$(document).on('click', ".my-ticket", function() {
 		loadMyTicket("main-content", null, null, null, null, null);
 	});
 	$(document).on('click', "#close-ticket", function() {
 				return false;
+			}
 			var ticketId = $("#ticketIdforactivity").val();
 			var assignee = $("#assigneeUser").val();
 			var roleType = $("#role").val();
+			var isCrmUser = $("#crmUser").val();
 			count = 0;
 			console.log(message, ticketId, assignee);
-			createActivity(message, ticketId, assignee, internal, roleType,
+			createActivity(message, ticketId, assignee, internal, roleType, isCrmUser,
 				documentIds);
 		});
 	$(document).on('click', ".uploadFile", function() {
 		$("#file1").trigger('click');
 				alert("Position created successfully");
 				loadCreatePosition(domId);
+			}
 		});
+}
-function createActivity(message, ticketId, assigneeId, internal, roleType,
+function createActivity(message, ticketId, assigneeId, internal, roleType, isCrmUser,
 	documentIds) {
 	var params = {
 		"message": message,
 		"ticketId": ticketId,
 		documentIds.splice(0, documentIds.length);
 		console.log(documentIds)
 		$(".fileList li").remove();
 		var assigneeName = response.firstName;
-		loadActivities(ticketId, assigneeName, internal, roleType)
+		loadActivities(ticketId, assigneeName, internal, roleType, isCrmUser)
 	});
+}
 function loadEditTicket(ticketId) {
 	doGetAjaxRequestHandler(context + "/cs/edit-ticket?ticketId=" + ticketId,
 		function(response) {
 		response) {
 		$('#' + domId).html(response);
 	});
+}
-function loadActivities(ticketId, assignee, internal, roleType) {
+function loadActivities(ticketId, assignee, internal, roleType, isCrmUser) {
-	$(".activity-container .modal-body").empty();
+	// Show loading spinner
+	$(".activity-container .modal-body").html('<div class="text-center" style="padding:20px;"><i class="fa fa-spinner fa-spin fa-2x"></i><br>Loading...</div>');
 	$("#activityMessage").val("");
 	$("#ticketIdforactivity").val(ticketId);
 	$("#role").val(roleType);
+	$("#crmUser").val(isCrmUser);
 	$(".activity-container .modal-title").html(
 		"Activity history for Ticket Id " + ticketId)
 	console.log(ticketId);
 	doGetAjaxRequestHandler(
 		context + "/cs/getActivities?ticketId=" + ticketId,
 		function(response) {
+			$(".activity-container .modal-body").empty(); // Clear loading spinner
 			response = JSON.parse(response);
 			console.log(response);
 			for (var i = 0; i < response.length; i++) {
 				console.log(response[i].activityAttachment.length);
 				var activityAttachment = []
 				var attachments = "";
 				if (response[i].activityAttachment.length > 0) {
-					response
 					for (var j = 0; j < response[i].activityAttachment.length; j++) {
+						var docName = escapeHtml(response[i].activityAttachment[j].documentName);
 						var assigneeAttachment = "<a href=\"javascript:void(0)\" style=\"color:#337ab7;float:right;\"onclick=\"downloadDocument("
 							+ response[i].activityAttachment[j].documentId
 							+ ",\`"
-							+ response[i].activityAttachment[j].documentName
+							+ docName
 							+ "\`)\">"
-							+ response[i].activityAttachment[j].documentName
+							+ docName
 							+ "&nbsp;<i class=\"fa fa-download\"></i>"
 							+ "</a>"
 						activityAttachment.push(assigneeAttachment);
+					}
 					attachments = activityAttachment.join("");
 					console.log(attachments);
+				}
-				if (response[i].type == "OPENED"
+				var activityType = response[i].type;
-					|| response[i].type == "COMMUNICATION_IN") {
+				var escapedMessage = escapeHtml(response[i].message);
+				var formattedTime = moment(response[i].createTimestamp).format('DD/MM/YYYY, h:mm:ss a');
+				if (activityType == ActivityType.OPENED || activityType == ActivityType.COMMUNICATION_IN) {
 					var partnerMessage = "<div class=\"incoming_msg\">"
 						+ "<div class=\"received_msg\">"
 						+ "<div class=\"received_withd_msg\">" + "<p>"
-						+ response[i].message + "</p><div>"
+						+ escapedMessage + "</p><div>"
 						+ `${attachments}`
 						+ "</div> <span class=\"time_date\"> "
-						+ moment(response[i].createTimestamp).format('DD/MM/YYYY, h:mm:ss a')
+						+ formattedTime
 						+ "</span></div>" + "</div>" + "</div>";
 					$(".activity-container .modal-body").append(
 						partnerMessage);
-				} else if (response[i].type == "COMMUNICATION_OUT") {
+				} else if (activityType == ActivityType.COMMUNICATION_OUT) {
+					var senderName = escapeHtml(response[i].name ? response[i].name : "Support");
 					var assigneeMessage = "<div class=\"outgoing_msg\">"
 						+ "<div class=\"sent_msg\">"
 						+ "<span style=color:green>"
 						+ "~"
-						+ (response[i].name ? response[i].name
-							: "Support") + "<p>"
+						+ senderName + "<p>"
-						+ response[i].message + "</span> </p><div>"
+						+ escapedMessage + "</span> </p><div>"
 						+ `${attachments}`
 						+ "</div> <span class=\"time_date\">"
-						+ moment(response[i].createTimestamp).format('DD/MM/YYYY, h:mm:ss a')
+						+ formattedTime
 						+ "</span> </div>" + "</div>";
 					$(".activity-container .modal-body").append(
 						assigneeMessage);
-				} else if (response[i].name
+				} else if (response[i].name && activityType == ActivityType.COMMUNICATION_INTERNAL) {
-					&& response[i].type == "COMMUNICATION_INTERNAL") {
+					var senderName = escapeHtml(response[i].name);
 					var assigneeMessage = "<div class=\"outgoing_msg\">"
 						+ "<div class=\"sent_msg\">"
 						+ "<span style=color:green>"
 						+ "~"
-						+ response[i].name
+						+ senderName
 						+ "<p style=\"color: white;background: #b75454;\">"
-						+ response[i].message + "</span> </p> <div>"
+						+ escapedMessage + "</span> </p> <div>"
 						+ `${attachments}`
 						+ "</div> <span class=\"time_date\">"
-						+ moment(response[i].createTimestamp).format('DD/MM/YYYY, h:mm:ss a')
+						+ formattedTime
 						+ "</span> </div>" + "</div>";
 					$(".activity-container .modal-body").append(
 						assigneeMessage);
 				} else {
 					var assigneeMessage = "<div class=\"outgoing_msg\">"
 						+ "<div class=\"sent_msg\">" + "<p>"
-						+ response[i].message + "</span> </p> <div>"
+						+ escapedMessage + "</span> </p> <div>"
 						+ `${attachments}`
 						+ "</div> <span class=\"time_date\">"
-						+ moment(response[i].createTimestamp).format('DD/MM/YYYY, h:mm:ss a')
+						+ formattedTime
 						+ "</span> </div>" + "</div>";
 					$(".activity-container .modal-body").append(
 						assigneeMessage);
+				}
+			}
+			// Only show internal checkbox to CRM users (they can choose internal/external)
+			// Non-CRM users always send internal, so hide the checkbox
-			if (roleType == "true" || roleType == true) {
+			if (toBool(roleType) && toBool(isCrmUser)) {
 				$('.internalCheckBox').css('display', 'block');
-				if (internal == true || internal == "true") {
-					$('#internalCommunication').prop('checked', true);
-				} else {
-					$('#internalCommunication').prop('checked', false);
+				$('#internalCommunication').prop('checked', toBool(internal));
-				}
 			} else {
 				$('.internalCheckBox').css('display', 'none');
+				// Non-CRM users always send internal
+				$('#internalCommunication').prop('checked', true);
+			}
 		});
+}
 function downloadDocument(documentId, documentName) {

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js – Rev 34913 → 35569