Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status updation , session based select filter

Browse Source
This commit is contained in:
resicovenba 2018-02-28 11:24:30 +05:30
parent 78c22a9c28
commit 7c125401fa
6 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -386,7 +386,7 @@ class StatusUpdation_model extends CI_Model
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.BatchCode = '$Batch' AND SC.UniversityID = '$University'
SC.SessionID = '$Batch' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.IsActive = '1'";
// AND S.BranchCode = '$branch'
@ -402,7 +402,7 @@ class StatusUpdation_model extends CI_Model
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
SC.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.IsActive = '1'";
// AND S.BranchCode = '$branch'
@ -457,7 +457,7 @@ class StatusUpdation_model extends CI_Model
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.BatchCode = '$Batch' AND SC.UniversityID = '$University'
SC.SessionID = '$Batch' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.BranchID = '$branch'
AND SC.IsActive = '1'";
@ -474,7 +474,7 @@ class StatusUpdation_model extends CI_Model
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
SC.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.BranchID = '$branch'
AND SC.IsActive = '1'";
@ -513,10 +513,19 @@ class StatusUpdation_model extends CI_Model
$courseDetails = $courDetails->result();
$resultArr['Course'] =$courseDetails;
// Batch Details
$this->db->select('t3.BatchName, t3.BatchCode');
$this->db->from(''.BATCH. ' as t3');
$this->db->where('t3.UniversityID', $clip->UniversityID);
$this->db->where('t3.IsActive', 1);
// $this->db->select('t3.BatchName, t3.BatchCode');
// $this->db->from(''.SESSIONMASTER. ' as t3');
// $this->db->where('t3.UniversityID', $clip->UniversityID);
// $this->db->where('t3.IsActive', 1);
//Session Details
$this->db->select('B.SessionID, B.SessionName');
$this->db->from(SESSIONMASTER . ' as B');
$this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID');
$this->db->where('SD.UniversityID', $clip->UniversityID);
$this->db->where('B.IsActive', 1);
$this->db->where('SD.IsActive', 1);
$batDetails = $this->db->get();
$batchDetails = $batDetails->result();
$resultArr['Batch'] =$batchDetails;

49
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -708,25 +708,25 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.stepsModel.length = 0;
}
$scope.getChangeDate = function () {
// alert();
try {
var formate = "dd-MM-yyyy";
$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
// alert($scope.myModel.dateofbirth);
// var myDate = new Date($scope.myModel.dateofbirth);
// alert(myDate);
// if(typeof myDate === 'function') {
// alert("true")
// } else {
// alert("error")
// }
}
catch(e) {
// alert('error');
// alert(err);
}
}
// $scope.getChangeDate = function () {
// // alert();
// try {
// var formate = "dd-MM-yyyy";
// $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
// // alert($scope.myModel.dateofbirth);
// // var myDate = new Date($scope.myModel.dateofbirth);
// // alert(myDate);
// // if(typeof myDate === 'function') {
// // alert("true")
// // } else {
// // alert("error")
// // }
// }
// catch(e) {
// // alert('error');
// // alert(err);
// }
// }
// add student
$scope.studentFORM = {
@ -750,7 +750,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
} else {
$scope.disableButton = true;
var formate = "dd-MM-yyyy";
// $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
$scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0;
$scope.myModelCourseAdd.dateofjoining = $filter('date')(new Date($scope.myModelCourseAdd.dateofjoining), formate);
var idStuProof = $scope.files[0];
@ -2057,11 +2057,11 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.stepsModel.length = 0;
}
$scope.getChangeDate = function () {
var formate = "dd-MM-yyyy";
$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
// $scope.getChangeDate = function () {
// var formate = "dd-MM-yyyy";
// $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
}
// }
$scope.tabactive1 = false;
$scope.tabactive2 = false;
@ -2140,6 +2140,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
} else {
$scope.disableButton = true;
var formate = "dd-MM-yyyy";
$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
myModel.switchsetting = myModel.switchsetting === true ? 1 : 0;
myModelCourseAdd.dateofjoining = $filter('date')(new Date(myModelCourseAdd.dateofjoining), formate);
var idStuProof = $scope.files[0];

6
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -45,12 +45,12 @@
<div class="col-md-3">
<label for="form-field-select-2">
Batch
Session
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
<option value="" selected>Select Session</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
</select>
</div>

6
Apollo/assets/views/status-update/application_status.html
View File

@ -45,12 +45,12 @@
<div class="col-md-3">
<label for="form-field-select-2">
Batch
Session
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
<option value="" selected>Select Session</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
</select>
</div>

6
Apollo/assets/views/status-update/certification_status.html
View File

@ -45,12 +45,12 @@
<div class="col-md-3">
<label for="form-field-select-2">
Batch
Session
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
<option value="" selected>Select Session</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
</select>
</div>

6
Apollo/assets/views/status-update/study_material_status.html
View File

@ -45,12 +45,12 @@
<div class="col-md-3">
<label for="form-field-select-2">
Batch
Session
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
<option value="" selected>Select Session</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
</select>
</div>