Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c151fdbfa5
@ -270,6 +270,7 @@ class Broadcast_model extends CI_Model
|
||||
curl_close($ch);
|
||||
|
||||
$arrss = explode('<br>', $output);
|
||||
array_pop($arrss);
|
||||
// Array
|
||||
// (
|
||||
// [0] => MsgID
|
||||
@ -280,9 +281,10 @@ class Broadcast_model extends CI_Model
|
||||
// )
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$dateTime = $time;
|
||||
for($i=0, $c = count($arrss) ; $i< $c; $i++){
|
||||
$c = count($arrss);
|
||||
for($i=0 ; $i < $c; $i++){
|
||||
// echo $arrss[$i];exit();
|
||||
if( $arrss[$i] === '') {
|
||||
if( end($arrss)) {
|
||||
break;
|
||||
} else {
|
||||
$a = explode('|', $arrss[$i]);
|
||||
@ -292,14 +294,17 @@ class Broadcast_model extends CI_Model
|
||||
$delvOn = $a[3];
|
||||
$qury1 = "SELECT * FROM T_BroadcastDeliveryCron WHERE MsgId = '$msgId'";
|
||||
$choe = $this->db->query($qury1)->first_row();
|
||||
// print_r($choe);exit();
|
||||
if($this->db->query($qury1)->first_row()){
|
||||
$qury2 = "UPDATE T_BroadcastDeliveryCron SET DeliveredStatus = '$delvStatus', DeliveredOn = '$delvOn' WHERE MsgId = '$msgId'";
|
||||
|
||||
$choe2 = $this->db->query($qury2);
|
||||
continue;
|
||||
// continue;
|
||||
} else {
|
||||
$qury3 = " INSERT INTO T_BroadcastDeliveryCron (MsgId, MobileNumber, DeliveredStatus, DeliveredOn, CreatedOn) VALUES('$msgId', '$msgNumb', '$delvStatus', '$delvOn', '$dateTime')";
|
||||
|
||||
$choe3 = $this->db->query($qury3);
|
||||
continue;
|
||||
// continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ class Student_model extends CI_Model
|
||||
// echo $loginUserId, $loginUserBranchId, $loginUserType; exit();
|
||||
if ($loginUserType == SUPER_ADMIN) {
|
||||
// list for super admin based on branch
|
||||
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Course"] === '') {
|
||||
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
|
||||
$this->db->select('*');
|
||||
$this->db->from(STUDENTS);
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
@ -62,19 +62,34 @@ class Student_model extends CI_Model
|
||||
|
||||
$University = $getSearchData['University'];
|
||||
$Course = $getSearchData['Course'];
|
||||
$Batch = $getSearchData['Batch'];
|
||||
// $Batch = $getSearchData['Batch'];
|
||||
$Batch='';
|
||||
$StuStatus = $getSearchData['Status'];
|
||||
|
||||
$subQuery = "SELECT S.*
|
||||
if($StuStatus == '' ){
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND SC.BatchCode LIKE '%$Batch%'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
} else {
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND S.IsActive = '$StuStatus'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
}
|
||||
|
||||
$stuDetails = $this->db->query($subQuery);
|
||||
|
||||
@ -127,7 +142,7 @@ class Student_model extends CI_Model
|
||||
|
||||
} else if ($loginUserType == ADMIN) {
|
||||
// list for admin
|
||||
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Course"] === '') {
|
||||
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
|
||||
// print_r($getSearchData);exit();
|
||||
$this->db->select('*');
|
||||
$this->db->from(STUDENTS);
|
||||
@ -154,19 +169,34 @@ class Student_model extends CI_Model
|
||||
|
||||
$University = $getSearchData['University'];
|
||||
$Course = $getSearchData['Course'];
|
||||
$Batch = $getSearchData['Batch'];
|
||||
|
||||
$subQuery = "SELECT S.*
|
||||
// $Batch = $getSearchData['Batch'];
|
||||
$Batch='';
|
||||
$StuStatus = $getSearchData['Status'];
|
||||
if($StuStatus == '' ){
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND SC.BatchCode LIKE '%$Batch%'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
} else {
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND S.IsActive = '$StuStatus'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
}
|
||||
|
||||
|
||||
$stuDetails = $this->db->query($subQuery);
|
||||
|
||||
@ -182,7 +212,9 @@ class Student_model extends CI_Model
|
||||
|
||||
} else if ($loginUserType == EMPLOYEE) {
|
||||
// list for staff
|
||||
|
||||
// list for admin
|
||||
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
|
||||
// print_r($getSearchData);exit();
|
||||
$this->db->select('*');
|
||||
$this->db->from(STUDENTS);
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
@ -195,6 +227,58 @@ class Student_model extends CI_Model
|
||||
} else {
|
||||
$results['studentList'] = false;
|
||||
}
|
||||
} else {
|
||||
// print_r($getSearchData);exit();
|
||||
// $this->db->select('t1.*');
|
||||
// // $this->db->from(STUDENTS);
|
||||
// $this->db->from('' . STUDENTS . ' as t1');
|
||||
// $this->db->order_by('t1.CreatedOn', 'DESC');
|
||||
// $this->db->where('t1.BranchCode', $loginUserBranchId);
|
||||
// $this->db->from('' . STUDENTCOURSE . ' as t2', 't2.StudentID = t1.StudentID', 'LEFT');
|
||||
// $this->db->where('t2.UniversityID', $getSearchData["University"]);
|
||||
// $this->db->where('t2.CourseID', $getSearchData["Course"]);
|
||||
|
||||
$University = $getSearchData['University'];
|
||||
$Course = $getSearchData['Course'];
|
||||
// $Batch = $getSearchData['Batch'];
|
||||
$Batch='';
|
||||
$StuStatus = $getSearchData['Status'];
|
||||
|
||||
if($StuStatus == '' ){
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
} else {
|
||||
$subQuery = "SELECT S.*
|
||||
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
|
||||
SC.CourseID = C.CourseID
|
||||
WHERE
|
||||
SC.UniversityID LIKE '%$University%'
|
||||
AND SC.CourseID LIKE '%$Course%'
|
||||
AND S.IsActive = '$StuStatus'
|
||||
AND S.BranchCode = '$loginUserBranchId'
|
||||
GROUP BY SC.StudentID
|
||||
ORDER BY S.CreatedOn";
|
||||
}
|
||||
$stuDetails = $this->db->query($subQuery);
|
||||
|
||||
// $stuDetails = $this->db->get();
|
||||
$checkArr = $stuDetails->result();
|
||||
if (count($checkArr) > 0) {
|
||||
$results['studentList'] = true;
|
||||
$results['student_details'] = $stuDetails->result();
|
||||
} else {
|
||||
$results['studentList'] = false;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
$results['studentList'] = false;
|
||||
|
||||
@ -127,8 +127,8 @@
|
||||
},
|
||||
"sendSMSPage": {
|
||||
"MAIN": "BROADCAST",
|
||||
"SENDSMS": "SMS SEND",
|
||||
"SENDSMSDETAILS": "SEND SMS DETAILS"
|
||||
"SENDSMS": "SMS SENT",
|
||||
"SENDSMSDETAILS": "SENT SMS DETAILS"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -394,18 +394,18 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
}).state('app.broadCast.sendSMSPage', {
|
||||
url: '/sendSMS',
|
||||
templateUrl: "assets/views/sendSMS/sendSMSsuperadmin.html",
|
||||
title: 'send SMS',
|
||||
title: 'sent SMS',
|
||||
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'sendSMSsuperadminCtrl','ngTable'),
|
||||
ncyBreadcrumb: {
|
||||
label: 'send SMS'
|
||||
label: 'sent SMS'
|
||||
}
|
||||
}).state('app.broadCast.sendSMSDetails', {
|
||||
url: '/sendSMSDetails',
|
||||
templateUrl: "assets/views/sendSMS/sendSMSDetailssuperadmin.html",
|
||||
title: 'Send SMS Details',
|
||||
title: 'Sent SMS Details',
|
||||
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'sendSMSDetailssuperadminCtrl','ngTable'),
|
||||
ncyBreadcrumb: {
|
||||
label: 'Send SMS Details'
|
||||
label: 'Sent SMS Details'
|
||||
}
|
||||
}).state('app.daybook.income', {
|
||||
url: '/income',
|
||||
|
||||
@ -187,7 +187,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
// Select one row in a table once
|
||||
$scope.setOneSelect = function (value) {
|
||||
angular.forEach($scope.searchResultDetails, function (item) {
|
||||
item.Selected = value;
|
||||
item.Selected = false;
|
||||
});
|
||||
value.Selected = true;
|
||||
$scope.OpenWindowStatus = true;
|
||||
|
||||
@ -180,14 +180,14 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
||||
|
||||
// mobile number search functionlity
|
||||
$scope.mySearchChangeFunc = function (val) {
|
||||
if (val > 0) {
|
||||
$scope.allSelectedHide = true;
|
||||
$scope.allSelected('undefined');
|
||||
$scope.OpenWindowStatus = false;
|
||||
} else {
|
||||
$scope.allSelected('undefined');
|
||||
$scope.allSelectedHide = false;
|
||||
}
|
||||
// if (val > 0) {
|
||||
// $scope.allSelectedHide = true;
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.OpenWindowStatus = false;
|
||||
// } else {
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.allSelectedHide = false;
|
||||
// }
|
||||
}
|
||||
// End: mobile number search functionlity
|
||||
|
||||
@ -220,7 +220,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
||||
// Select one row in a table once
|
||||
$scope.setOneSelect = function (value) {
|
||||
angular.forEach($scope.searchResultDetails, function (item) {
|
||||
item.Selected = value;
|
||||
item.Selected = false;
|
||||
});
|
||||
value.Selected = true;
|
||||
$scope.OpenWindowStatus = true;
|
||||
|
||||
@ -100,7 +100,12 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
|
||||
},
|
||||
reset: function (form) {
|
||||
|
||||
$scope.myModel = angular.copy($scope.master);
|
||||
$scope.myModel = {
|
||||
"batchCode": "",
|
||||
"batchName": "",
|
||||
"universityName":"",
|
||||
"switchsetting": true
|
||||
};
|
||||
form.$setPristine(true);
|
||||
}
|
||||
};
|
||||
|
||||
@ -175,14 +175,14 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
|
||||
// mobile number search functionlity
|
||||
$scope.mySearchChangeFunc = function (val) {
|
||||
if (val > 0) {
|
||||
$scope.allSelectedHide = true;
|
||||
$scope.allSelected('undefined');
|
||||
$scope.OpenWindowStatus = false;
|
||||
} else {
|
||||
$scope.allSelected('undefined');
|
||||
$scope.allSelectedHide = false;
|
||||
}
|
||||
// if (val > 0) {
|
||||
// $scope.allSelectedHide = true;
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.OpenWindowStatus = false;
|
||||
// } else {
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.allSelectedHide = false;
|
||||
// }
|
||||
}
|
||||
// End: mobile number search functionlity
|
||||
|
||||
@ -217,7 +217,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
// Select one row in a table once
|
||||
$scope.setOneSelect = function (value) {
|
||||
angular.forEach($scope.searchResultDetails, function (item) {
|
||||
item.Selected = value;
|
||||
item.Selected = false;
|
||||
});
|
||||
value.Selected = true;
|
||||
$scope.OpenWindowStatus = true;
|
||||
|
||||
@ -125,13 +125,23 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
};
|
||||
|
||||
$scope.searchData = {
|
||||
"University": "",
|
||||
"University": "",
|
||||
"Course": "",
|
||||
"Status": ""
|
||||
}
|
||||
$scope.myUnivSearch = "";
|
||||
$scope.getUniveId = function (univ) {
|
||||
let name = JSON.parse(univ);
|
||||
if( univ === ''){
|
||||
$scope.myUnivSearch = "";
|
||||
$scope.searchData.University = '';
|
||||
$scope.searchData.Course = '';
|
||||
$scope.searchData.Batch = '';
|
||||
$scope.courseData = name.Course;
|
||||
$scope.batchData = name.Batch;
|
||||
$scope.OpenWindowStatus = false;
|
||||
$scope.getStudentList();
|
||||
} else {
|
||||
let name = JSON.parse(univ);
|
||||
$scope.searchData.University = name.UniversityID;
|
||||
$scope.searchData.Course = '';
|
||||
$scope.searchData.Batch = '';
|
||||
@ -139,6 +149,8 @@ $scope.myUnivSearch = "";
|
||||
$scope.batchData = name.Batch;
|
||||
$scope.OpenWindowStatus = false;
|
||||
$scope.getStudentList();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -151,13 +151,13 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
// mobile number search functionlity
|
||||
$scope.mySearchChangeFunc = function (val) {
|
||||
if (val > 0) {
|
||||
$scope.allSelectedHide = true;
|
||||
$scope.allSelected('undefined');
|
||||
$scope.OpenWindowStatus = false;
|
||||
// $scope.allSelectedHide = true;
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.OpenWindowStatus = false;
|
||||
} else {
|
||||
$scope.allSelected('undefined');
|
||||
$scope.allSelectedHide = false;
|
||||
$scope.OpenWindowStatus = false;
|
||||
// $scope.allSelected('undefined');
|
||||
// $scope.allSelectedHide = false;
|
||||
// $scope.OpenWindowStatus = false;
|
||||
}
|
||||
}
|
||||
// End: mobile number search functionlity
|
||||
@ -189,7 +189,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
// Select one row in a table once
|
||||
$scope.setOneSelect = function (value) {
|
||||
angular.forEach($scope.searchResultDetails, function (item) {
|
||||
item.Selected = value;
|
||||
item.Selected = false;
|
||||
});
|
||||
value.Selected = true;
|
||||
$scope.OpenWindowStatus = true;
|
||||
|
||||
@ -77,14 +77,14 @@
|
||||
</th>
|
||||
<th>Message Count
|
||||
</th>
|
||||
<th>Send On
|
||||
<th>Sent On
|
||||
</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in resData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:3">
|
||||
<tr>
|
||||
<td>{{p.MsgBody}} {{$index}}</td>
|
||||
<td>{{p.MsgBody}}</td>
|
||||
<td>{{p.MSG_SEND_CNT}}</td>
|
||||
<td>{{p.CreatedOn}}</td>
|
||||
<td class="center">
|
||||
@ -106,8 +106,8 @@
|
||||
<thead style="background-color: cadetblue">
|
||||
<th>Message Id</th>
|
||||
<th>Mobile Number</th>
|
||||
<th>Delivery Status</th>
|
||||
<th>Delivery On</th>
|
||||
<th>Delivered Status</th>
|
||||
<th>Delivered On</th>
|
||||
</thead>
|
||||
<tbody dir-paginate="s in resGroupSendData |orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:3" pagination-id="myInnerPage">
|
||||
<th>{{s.MsgId}}</th>
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Mobile Number
|
||||
Mobile Number/Name
|
||||
</label>
|
||||
<script>
|
||||
$(function () {
|
||||
@ -112,8 +112,8 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br>
|
||||
<input class="form-control" type="text" ng-model="search"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile/Name" /><br><br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -96,7 +96,7 @@
|
||||
<div class="col-md-3">
|
||||
|
||||
<label for="form-field-select-2">
|
||||
Mobile Number
|
||||
Mobile Number/Name
|
||||
</label>
|
||||
<script>
|
||||
$(function () {
|
||||
@ -113,8 +113,8 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br>
|
||||
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile/Name" /><br><br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Mobile Number
|
||||
Mobile Number/Name
|
||||
</label>
|
||||
<script>
|
||||
$(function () {
|
||||
@ -112,8 +112,8 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br>
|
||||
<input class="form-control" type="text" ng-model="search"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile/Name" /><br><br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Mobile Number
|
||||
Mobile Number/Name
|
||||
</label>
|
||||
<script>
|
||||
$(function () {
|
||||
@ -112,8 +112,8 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br>
|
||||
<input class="form-control" type="text" ng-model="search"
|
||||
id="search" autofocus tabindex="1" placeholder="Search Mobile/Name" /><br><br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -56,31 +56,7 @@
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<!--<pre>{{searchData | json }}</pre> -->
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
|
||||
ng-change="getUniveId(myUnivSearch)">
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Course</option>
|
||||
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-3">
|
||||
<!--<label for="form-field-select-2">
|
||||
Batch
|
||||
</label>
|
||||
@ -100,6 +76,46 @@
|
||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
|
||||
ng-change="getUniveId(myUnivSearch)">
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Course</option>
|
||||
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Status
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Status" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Status</option>
|
||||
<option value="1">Active</option>
|
||||
<option value="0">Deactive</option>
|
||||
</select>
|
||||
<!--<label for="form-field-select-2">
|
||||
Search
|
||||
</label>
|
||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||
-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@ -85,31 +85,7 @@
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<!--<pre>{{searchData | json }}</pre> -->
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
|
||||
ng-change="getUniveId(myUnivSearch)">
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Course</option>
|
||||
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-3">
|
||||
<!--<label for="form-field-select-2">
|
||||
Batch
|
||||
</label>
|
||||
@ -129,6 +105,46 @@
|
||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
|
||||
ng-change="getUniveId(myUnivSearch)">
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Course</option>
|
||||
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Status
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Status" ng-change="getValueChange()">
|
||||
<option value="" selected>Select Status</option>
|
||||
<option value="1">Active</option>
|
||||
<option value="0">Deactive</option>
|
||||
</select>
|
||||
<!--<label for="form-field-select-2">
|
||||
Search
|
||||
</label>
|
||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||
-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user