diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 4304f0e9..61f43dbe 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -177,6 +177,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod /** * Auto Call Tracking Sriram */ + $rootScope.selectedStudentMN = []; $scope.selectedStudentsID = []; $scope.isCheckAll = function(e){ var val = (e.target.checked ? true : false); @@ -210,11 +211,13 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod var ide = e.target; var val = (ide.checked ? true : false); var sid = e.target.id; + var smn = e.target.Phone_number; angular.forEach($scope.app_pending_data,function(value,key){ //console.log(value); if(sid == value.Student_id) { sid = value; + smn = value.Phone_number; } }); @@ -227,6 +230,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //console.log("PUSH"); $scope.selectedStudentsID.push(sid); + $rootScope.selectedStudentMN.push(smn); } } @@ -235,6 +239,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //console.log("POP"); $scope.selectedStudentsID.splice(pos,1); + $rootScope.selectedStudentMN.splice(pos,1); } // if(val){ @@ -244,6 +249,21 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } //console.log($scope.selectedStudentsID); } + $scope.sendingsms = function(){ + + + //$rootScope.student = $scope.selectedStudentsID; + if($scope.selectedStudentMN ==''){ + swal('Select Check box','','warning'); + return false; + } + else{ + + $state.go('app.broadCast.sendSMSPage'); + + + } + } $scope.calltracking = function(){ //$rootScope.student = $scope.selectedStudentsID; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index c2e66a87..0251281b 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -227,6 +227,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", /** * Auto Call Tracking Sriram */ + $rootScope.selectedStudentbalfeesMN = []; $scope.selectedStudentsID = []; $scope.isCheckAll = function(e){ var val = (e.target.checked ? true : false); @@ -260,6 +261,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", var ide = e.target; var val = (ide.checked ? true : false); var sid = e.target.id; + var smn = e.target.Phone_number; // console.log("328"); // console.log($scope.balfee_data); angular.forEach($scope.balfee_data,function(value,key){ @@ -267,6 +269,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", if(sid == value.Student_id && s == value.Sem_year) { sid = value; + smn = value.Phone_number; } }); console.log(sid); @@ -280,6 +283,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", //console.log("PUSH"); $scope.selectedStudentsID.push(sid); + $rootScope.selectedStudentbalfeesMN.push(smn); } } @@ -288,6 +292,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", //console.log("POP"); $scope.selectedStudentsID.splice(pos,1); + $rootScope.selectedStudentbalfeesMN.splice(smn); } // if(val){ @@ -297,6 +302,21 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } //console.log($scope.selectedStudentsID); } + $scope.sendingsms = function(){ + + + //$rootScope.student = $scope.selectedStudentsID; + if($scope.selectedStudentbalfeesMN ==''){ + swal('Select Check box','','warning'); + return false; + } + else{ + + $state.go('app.broadCast.sendSMSPage'); + + + } + } $scope.calltracking = function(){ //$rootScope.student = $scope.selectedStudentsID; diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 580a3c64..aa6cb650 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -173,6 +173,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod /** * Auto Call Tracking Sriram */ + $rootScope.selectedStudentcertificateMN = []; $scope.selectedStudentsID = []; $scope.isCheckAll = function(e){ var val = (e.target.checked ? true : false); @@ -206,6 +207,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod var ide = e.target; var val = (ide.checked ? true : false); var sid = e.target.id; + var smn = e.target.Phone_number; // console.log("328"); // console.log($scope.balfee_data); angular.forEach($scope.cert_data,function(value,key){ @@ -213,6 +215,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod if(sid == value.Student_id) { sid = value; + smn = value.Phone_number; } }); console.log(sid); @@ -226,6 +229,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod //console.log("PUSH"); $scope.selectedStudentsID.push(sid); + $rootScope.selectedStudentcertificateMN.push(smn); } } @@ -234,6 +238,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod //console.log("POP"); $scope.selectedStudentsID.splice(pos,1); + $rootScope.selectedStudentcertificateMN.splice(pos,1); } // if(val){ @@ -243,6 +248,21 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod } //console.log($scope.selectedStudentsID); } + $scope.sendingsms = function(){ + + + //$rootScope.student = $scope.selectedStudentsID; + if($scope.selectedStudentcertificateMN ==''){ + swal('Select Check box','','warning'); + return false; + } + else{ + + $state.go('app.broadCast.sendSMSPage'); + + + } + } $scope.calltracking = function(){ //$rootScope.student = $scope.selectedStudentsID; diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 2b261e15..9fdfe250 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -1,6 +1,6 @@ 'use strict'; /*** controller for Wizard Form example***/ -app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { +app.controller('sendSMSsuperadminCtrl', ["$scope","$rootScope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope,$rootScope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) { /** * Send SMS Functionality @@ -10,6 +10,40 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", " var localDetails = ipCookie('cookiechk'); $scope.init = function () { + $scope.mobilenumbers=$rootScope.selectedStudentMN; + $scope.certificatemobilenumbers=$rootScope.selectedStudentcertificateMN; + $scope.balfeesmobilenumbers=$rootScope.selectedStudentbalfeesMN; + + if($scope.mobilenumbers != undefined) + { + //tabtwo: true + $scope.tabone = false; + $scope.tabtwo = true; + $scope.tabthree = false; + $scope.radio=1; + $scope.listMobileNums=$scope.mobilenumbers; + + } + if($scope.certificatemobilenumbers != undefined) + { + //tabtwo: true + $scope.tabone = false; + $scope.tabtwo = true; + $scope.tabthree = false; + $scope.radio=1; + $scope.listMobileNums=$scope.certificatemobilenumbers; + + } + if($scope.balfeesmobilenumbers != undefined) + { + //tabtwo: true + $scope.tabone = false; + $scope.tabtwo = true; + $scope.tabthree = false; + $scope.radio=1; + $scope.listMobileNums=$scope.balfeesmobilenumbers; + + } var logcheck = JSON.parse(localStorage.getItem('localObj')); diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 7774e21c..3c3906fa 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -80,15 +80,13 @@
-
- -
-
+
+ -
+ + - -
+
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index b5a7565a..2c662dc3 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -72,25 +72,24 @@ -
+
-
+
Total Fee:Rs.{{gettotal() || "0"}} -
-
+ Paid:Rs.{{getpaid() || "0"}} -
- -
+ Balance:Rs.{{getbalance() || "0"}} ({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)
-
+
+ + + -
-
+
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 363702cd..f0d557ad 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -121,10 +121,12 @@ td,th {
-
+
+ +
- +
diff --git a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html index df9bf5dd..bf455b0d 100755 --- a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html +++ b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html @@ -16,7 +16,7 @@
- +
- +