diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index a9539e2f..349de841 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -2844,7 +2844,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', @@ -2852,7 +2852,12 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" // size: size, resolve: { items1: function () { - return values; + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; } } }); @@ -2889,7 +2894,8 @@ app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "Words }]); 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);