diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js
index ba10f3fe..e715c628 100755
--- a/Apollo/assets/js/controllers/activityCtrl.js
+++ b/Apollo/assets/js/controllers/activityCtrl.js
@@ -10,22 +10,40 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$
         "ActivityID": "",
         "ActivityName": "",
         "Description": "",
-        "switchsetting": true
+        "switchsetting": true,
+        "status":""
 
     };
      /*
-    * edit batch details
-    * created by subaram
+    * edit activity details
+    * created by surendiran
     * */
+     $scope.p = {
+         "status":""
+     }
+
     $scope.editId = -1;
-    $scope.setEditId = function (pid) {
-        $scope.editId = pid;
+    $scope.setEditId = function (p) {
+        $scope.editId = p.ActivityID;
+        $scope.editStatusList = [];
+        angular.forEach(p.statusDetails, function (values, keys) {
+
+            $scope.editStatusList.push(values.ListCode);
+        })
+        $scope.viewEditStatus = {
+            list: $scope.editStatusList,
+        }
+        console.log($scope.viewEditStatus);
+
+
+
+
         $scope.viewId = -1;
     };
 
     /*
     * cancel edit div
-    * created by subaram
+    * created by surendiran
     * */
     $scope.cancel = function () {
         $scope.init();
@@ -40,10 +58,9 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$
     }
 
 
-$scope.activityForm = {
+    $scope.activityForm = {
        
-        submit: function (form, myModel,loading) {  
-        
+        submit: function (form, myModel,loading) {
             var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -61,9 +78,9 @@ $scope.activityForm = {
                 //    swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
             } else {
 
-                $scope.ldloading1 = {};
+                $scope.ldloading = {};
 
-                $scope.ldloading1[loading.replace('-', '_')] = true;
+                $scope.ldloading[loading.replace('-', '_')] = true;
 
    
         var addactivity = {
@@ -77,18 +94,19 @@ $scope.activityForm = {
                 activityName: myModel.ActivityName,
                 description: myModel.Description,
                 status: myModel.switchsetting,
+                activityStatus:myModel.status,
                 createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
             }
         };
         $http(addactivity).then(function (response) {
             if (response.data.status == 200 && response.data.activityStatus) {
-                $scope.ldloading1[loading.replace('-', '_')] = false;
+                $scope.ldloading[loading.replace('-', '_')] = false;
                 $scope.init();
                 swal("Success!", response.data.message, "success");
                 $state.go($state.current, {}, { reload: true });
             } else {
-                $scope.ldloading1[loading.replace('-', '_')] = false;
-                swal("Failed!", response.data.details, "error");
+                $scope.ldloading[loading.replace('-', '_')] = false;
+                swal("Failed!", response.data.message, "error");
             }
         });
 
@@ -103,6 +121,7 @@ $scope.activityForm = {
 *
 * created by surendiran
 *  */
+    $scope.statusList = [];
     $scope.loader = '';
     $scope.emptyData = '';
     $scope.init = function () {
@@ -121,10 +140,26 @@ $scope.activityForm = {
                 $scope.emptyData = true;
                 $scope.loader = true;
                 $scope.activityInfo = response.data.details;
+                $scope.masterActivityStatus=response.data.masterStatusList;
+                angular.forEach($scope.masterActivityStatus, function (values, keys) {
+                    $scope.statusData = {
+                        name: values.ListName,
+                        id: values.ListCode
+                    };
+                    $scope.statusList.push($scope.statusData);
+                })
             } else {
                 $scope.emptyData = false;
                 $scope.loader = false;
                 $scope.activityInfo = "";
+                $scope.masterActivityStatus=response.data.masterStatusList;
+                angular.forEach($scope.masterActivityStatus, function (values, keys) {
+                    $scope.statusData = {
+                        name: values.ListName,
+                        id: values.ListCode
+                    };
+                    $scope.statusList.push($scope.statusData);
+                })
             }
         });
     };
@@ -134,7 +169,7 @@ $scope.activityForm = {
     * update the Activity details
     * created by Surendiran
     * */
-    $scope.updateActivity = function (myModel, form, loading) {
+    $scope.updateActivity = function (myModel,listStatus, form, loading) {
 
         var firstError = null;
         if (form.$invalid) {
@@ -164,11 +199,12 @@ $scope.activityForm = {
                     'Content-Type': 'application/json'
                 },
                 data: {
-                     ListCode: myModel.ListCode,
-                     ListName: myModel.ListName,      
+                     activityID: myModel.ActivityID,
+                     activityName: myModel.ActivityName,
                      description: myModel.Description,                       
-                     status: myModel.IsActive,                      
-                    createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
+                     status: myModel.IsActive,
+                    activityStatus:listStatus.list,
+                    updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
                 }
             };
             $http(update).then(function (response) {