diff --git a/optmanagementprod/opt_management_production/doctype/optlistprod/optlistprod.py b/optmanagementprod/opt_management_production/doctype/optlistprod/optlistprod.py
index 3eed269..9717963 100644
--- a/optmanagementprod/opt_management_production/doctype/optlistprod/optlistprod.py
+++ b/optmanagementprod/opt_management_production/doctype/optlistprod/optlistprod.py
@@ -25,11 +25,12 @@ class optlistprod(Document):
 				"project_name" : str(client["project_name"]),
 				"client_name" : str(client["client_name"]),
 				"client_poc" : str(client["user_name"]),
-				"optin_received_date" : optinReceived(str(client["project_details"]),"Opt-in Received"),
-				"optin_approved_date" : optinReceived(str(client["project_details"]),"Opt-in Approved"),
 				"status" : str(client["status"]),
 				"instance" : str(client["instance"]),
 				"npi_id": str(client["npi_num"]),
+				"optin_received_date" : optinReceived(str(client["project_details"]),"Opt-in Received"),
+				"optin_approved_date" : optinReceived(str(client["project_details"]),"Opt-in Approved"),
+				
 		    	}
 		    )
 	    
@@ -117,11 +118,12 @@ def getValues():
 			"project_name" : str(client["project_name"]),
 			"client_name" : str(client["client_name"]),
 			"client_poc" : str(client["user_name"]),
-			"optin_received_date" : optinReceived(str(client["project_details"]),"Opt-in Received"),
-			"optin_approved_date" : optinReceived(str(client["project_details"]),"Opt-in Approved"),
 			"status" : str(client["status"]),
 			"instance" : str(client["instance"]),
 			"npi_id": str(client["npi_num"]),
+			"optin_received_date" : optinReceived(str(client["project_details"]),"Opt-in Received"),
+			"optin_approved_date" : optinReceived(str(client["project_details"]),"Opt-in Approved"),
+			
       	} 
 		for client in  records
 		]
diff --git a/optmanagementprod/www/optanalystview.html b/optmanagementprod/www/optanalystview.html
index e885641..ee77b86 100644
--- a/optmanagementprod/www/optanalystview.html
+++ b/optmanagementprod/www/optanalystview.html
@@ -118,7 +118,7 @@ document.addEventListener('DOMContentLoaded', function() {
     for(var rec in data)
     {
         tableData.push({
-        kol_id:rec.kol_id, kol_name:rec["kol_name"],project_name: rec["project_name"], client_name:rec["client_name"], client_poc:rec["client_poc"],optin_received_date:rec["optin_received_date"] == null ? ' ' : rec["optin_received_date"],optin_approved_date:rec["optin_approved_date"],status:rec["status"],instance:rec["instance"]
+        kol_id:rec.kol_id, kol_name:rec["kol_name"],project_name: rec["project_name"], client_name:rec["client_name"], client_poc:rec["client_poc"],optin_received_date:rec["optin_received_date"],optin_approved_date:rec["optin_approved_date"],status:rec["status"],instance:rec["instance"],npi_id:rec["npi_id"]
         // cs_Assigned_poc:rec["cs_Assigned_poc"],optin_type:rec["optin_type"],data_processed_date:rec["data_processed_date"]
        });
     }