diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index e715c628..a3878b34 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -33,10 +33,6 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ $scope.viewEditStatus = { list: $scope.editStatusList, } - console.log($scope.viewEditStatus); - - - $scope.viewId = -1; }; @@ -187,9 +183,9 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ } angular.element('.ng-invalid[name=' + firstError + ']').focus(); } else { - $scope.ldloading = {}; + $scope.ldloading3 = {}; - $scope.ldloading[loading.replace('-', '_')] = true; + $scope.ldloading3[loading.replace('-', '_')] = true; var update = { @@ -210,13 +206,13 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ $http(update).then(function (response) { if (response.data.status==200 && response.data.activityStatus) { - $scope.ldloading[loading.replace('-', '_')] = false; + $scope.ldloading3[loading.replace('-', '_')] = false; swal("Success!", response.data.message, "success"); $scope.editId = -1; $scope.init(); } else { - $scope.ldloading[loading.replace('-', '_')] = false; + $scope.ldloading3[loading.replace('-', '_')] = false; swal("Failed!", response.data.message, "error"); } });