From 88aa19747bbcff3213ae9596535bebfe1e9cb36f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 2 Nov 2018 13:12:30 +0530 Subject: [PATCH] coursecode added in send sms --- Apollo/api/application/models/Broadcast_model.php | 2 +- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 5 +++++ Apollo/assets/views/sendSMS/sendSMSsuperadmin.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Broadcast_model.php b/Apollo/api/application/models/Broadcast_model.php index e439c9e3..84fa1b74 100755 --- a/Apollo/api/application/models/Broadcast_model.php +++ b/Apollo/api/application/models/Broadcast_model.php @@ -101,7 +101,7 @@ class Broadcast_model extends CI_Model { $resultArr['UniversityID'] = $clip->UniversityID; $resultArr['UniversityName'] = $clip->UniversityName; // Course Details - $this->db->select('t2.CourseID, t2.CourseName'); + $this->db->select('t2.CourseID, t2.CourseName,t2.CourseCode'); $this->db->from('' . COURSE . ' as t2'); $this->db->where('t2.UniversityID', $clip->UniversityID); $this->db->where('t2.IsActive', 1); diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index b297e21d..3bb8e9f5 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -121,6 +121,8 @@ app.controller('sendSMSsuperadminCtrl', ["$scope","$rootScope", "$filter", "ngTa $http(empListreq).then(function (response) { if (response.data.univList) { $scope.universityData = response.data.university_details; + + } else { } }); @@ -128,11 +130,14 @@ app.controller('sendSMSsuperadminCtrl', ["$scope","$rootScope", "$filter", "ngTa $scope.getUniveId = function (univ) { let name = JSON.parse(univ); + // console.log(name) $scope.searchData.University = name.UniversityID; $scope.searchData.Course = ''; $scope.searchData.Batch = ''; $scope.courseData = name.Course; $scope.batchData = name.Batch; + + //call service for array list in desc order based on date angular.forEach($scope.batchData,function (values,key) { var parts = values.BatchDate.split("-"); diff --git a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html index bf455b0d..b0ac6233 100755 --- a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html +++ b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html @@ -56,7 +56,7 @@