diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 5c6bf7b9..a28330d3 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -488,7 +488,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" }; - $scope.open1 = function (values) { + $scope.open1 = function (values,type) { var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', @@ -496,7 +496,12 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" // size: size, resolve: { items1: function () { - return values; + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; } } }); @@ -533,7 +538,8 @@ app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsS }]); app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","WordsService", function ($scope, $modalInstance, items1,WordsService) { - $scope.items1 = items1; + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; $scope.ok = function () { $modalInstance.close($scope.selected.item);