Status updation screen changes based on batch search : kdk
This commit is contained in:
resicovenba
parent
3a0216710f
commit
e1891c8ba2
@ -24,23 +24,78 @@ class Broadcast_model extends CI_Model
|
||||
$Course = $reqData['Course'];
|
||||
$Batch = $reqData['Batch'];
|
||||
|
||||
$subQuery = "SELECT S.* , SC.CourseID , C.CourseName , U.UniversityName
|
||||
if($University != '' && $Course == '' && $Batch == '') {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName
|
||||
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%'
|
||||
SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
} else if ($University != '' && $Course != '' && $Batch == '' ) {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName
|
||||
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.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
} else if ( $University != '' && $Course == '' && $Batch != '' ) {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName
|
||||
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
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
} else if ( $University != '' && $Course != '' && $Batch != '' ) {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName
|
||||
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
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
// AND S.BranchCode = '$branch'
|
||||
// SC.UniversityID LIKE '%$University%'
|
||||
// AND SC.CourseID LIKE '%$Course%'
|
||||
// AND SC.BatchCode LIKE '%$Batch%'
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
}
|
||||
// $subQuery = "SELECT S.* , SC.CourseID , C.CourseName , U.UniversityName
|
||||
// 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.IsActive = '1'
|
||||
// AND SC.IsActive = '1'";
|
||||
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
// $queryDetails = $this->db->query($subQuery);
|
||||
// $results['searchResult'] = true;
|
||||
// $results['search_result_details'] = $queryDetails->result();
|
||||
|
||||
return $results;
|
||||
}
|
||||
}
|
||||
|
||||
// get list of universities, course, batch
|
||||
public function get_university_course_batch() {
|
||||
@ -137,10 +192,7 @@ class Broadcast_model extends CI_Model
|
||||
$results['smsSendDetailsList'] = $smsSendDetailsList;
|
||||
$results['smsSendDetailsListStatus'] = true;
|
||||
$results['smsSendDetailsList'] = $smsSendDetailsList;
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $results;
|
||||
}
|
||||
|
||||
|
||||
@ -385,8 +385,9 @@ class StatusUpdation_model extends CI_Model
|
||||
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.SessionID = '$Batch' AND SC.UniversityID = '$University'
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
// AND S.BranchCode = '$branch'
|
||||
@ -401,8 +402,9 @@ class StatusUpdation_model extends CI_Model
|
||||
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.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.IsActive = '1'";
|
||||
// AND S.BranchCode = '$branch'
|
||||
@ -452,12 +454,13 @@ class StatusUpdation_model extends CI_Model
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
} else if ( $University != '' && $Course == '' && $Batch != '' ) {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName
|
||||
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.SessionID = '$Batch' AND SC.UniversityID = '$University'
|
||||
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID
|
||||
LEFT JOIN ".COURSE." as C ON C.CourseID = SC.CourseID
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.BranchID = '$branch'
|
||||
AND SC.IsActive = '1'";
|
||||
@ -465,16 +468,17 @@ class StatusUpdation_model extends CI_Model
|
||||
// SC.UniversityID LIKE '%$University%'
|
||||
// AND SC.CourseID LIKE '%$Course%'
|
||||
// AND SC.BatchCode LIKE '%$Batch%'
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
} else if ( $University != '' && $Course != '' && $Batch != '' ) {
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName
|
||||
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName
|
||||
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.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
|
||||
WHERE SFS.CourseID = SC.CourseID AND
|
||||
SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
|
||||
AND S.IsActive = '1'
|
||||
AND SC.BranchID = '$branch'
|
||||
AND SC.IsActive = '1'";
|
||||
@ -482,9 +486,9 @@ class StatusUpdation_model extends CI_Model
|
||||
// SC.UniversityID LIKE '%$University%'
|
||||
// AND SC.CourseID LIKE '%$Course%'
|
||||
// AND SC.BatchCode LIKE '%$Batch%'
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
$queryDetails = $this->db->query($subQuery);
|
||||
$results['searchResult'] = true;
|
||||
$results['search_result_details'] = $queryDetails->result();
|
||||
}
|
||||
}
|
||||
return $results;
|
||||
@ -513,18 +517,18 @@ class StatusUpdation_model extends CI_Model
|
||||
$courseDetails = $courDetails->result();
|
||||
$resultArr['Course'] =$courseDetails;
|
||||
// Batch Details
|
||||
// $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);
|
||||
$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);
|
||||
|
||||
//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);
|
||||
// $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();
|
||||
|
||||
@ -134,10 +134,10 @@
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
<td>
|
||||
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
|
||||
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
|
||||
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
|
||||
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
|
||||
<td>{{p.Amount}}</td>
|
||||
|
||||
|
||||
<!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
|
||||
- </td>-->
|
||||
<td class="center" tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
|
||||
@ -289,7 +289,6 @@
|
||||
<option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@ -337,12 +336,11 @@
|
||||
<div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
|
||||
<label>
|
||||
Amount <span class="symbol required"></span>
|
||||
|
||||
</label>
|
||||
<input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
|
||||
ng-model="myModelAdd.amount" required/>
|
||||
<span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
|
||||
<!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
|
||||
<!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
@ -373,12 +371,9 @@
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
<!--<tab heading="Approve Income/Expense" id="addDayBook" ng-if="dayBookApprovalAccess == '1'">
|
||||
|
||||
<!--<tab heading="Approve Income/Expense" id="addDayBook" ng-if="dayBookApprovalAccess == '1'">
|
||||
<div ng-init="getApproveLoad()">
|
||||
</div>
|
||||
|
||||
|
||||
</tab>-->
|
||||
</tabset>
|
||||
</div>
|
||||
|
||||
@ -240,7 +240,7 @@
|
||||
<table style="width: 100%;" class="table table-hover" ng-if="dataLengthExpense > 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<!--<th></th>-->
|
||||
<th ng-if="dayBookApprovalAccess == '1'">
|
||||
|
||||
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
||||
@ -276,8 +276,8 @@
|
||||
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<label ng-if="dayBookApprovalAccess == '1' && p.Status == 'Pending'">
|
||||
<td ng-if="dayBookApprovalAccess == '1' && p.Status == 'Pending'">
|
||||
<label >
|
||||
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
|
||||
<!--{{p.StudentID}}-->
|
||||
</label>
|
||||
|
||||
@ -157,13 +157,13 @@
|
||||
<table style="width: 100%;" class="table table-hover" ng-if="dataLengthIncome > 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('BranchName')">Branch
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
<th ng-click="sort('BranchName')">Branch/Date
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
|
||||
<th ng-click="sort('Date')">Date
|
||||
<!--<th ng-click="sort('Date')">Date
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
</th>-->
|
||||
<th ng-click="sort('ListName')">Income/Expense
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -190,8 +190,8 @@
|
||||
</thead>
|
||||
<tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
<tr>
|
||||
<td>{{p.BranchName}}</td>
|
||||
<td>{{p.Date}}</td>
|
||||
<td>{{p.BranchName}}<br>{{p.Date}}</td>
|
||||
<!--<td>{{p.Date}}</td>-->
|
||||
<td>{{p.ListName}}</td>
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
@ -259,12 +259,12 @@
|
||||
<table style="width: 100%;" class="table table-hover" ng-if="dataLengthExpense > 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('BranchName')">Branch
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
<th ng-click="sort('BranchName')">Branch/Date
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th ng-click="sort('Date')">Date
|
||||
<!--<th ng-click="sort('Date')">Date
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
</th>-->
|
||||
<th ng-click="sort('ListName')">Income/Expense
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
@ -291,8 +291,8 @@
|
||||
</thead>
|
||||
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
<tr>
|
||||
<td>{{p.BranchName}}</td>
|
||||
<td>{{p.Date}}</td>
|
||||
<td>{{p.BranchName}}<br>{{p.Date}}</td>
|
||||
<!--<td>{{p.Date}}</td>-->
|
||||
<td>{{p.ListName}}</td>
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
|
||||
@ -45,12 +45,12 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Session
|
||||
Batch
|
||||
</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 Session</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
|
||||
<option value="" selected>Select Batch</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
@ -45,12 +45,12 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Session
|
||||
Batch
|
||||
</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 Session</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
|
||||
<option value="" selected>Select Batch</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
@ -45,12 +45,12 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Session
|
||||
Batch
|
||||
</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 Session</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
|
||||
<option value="" selected>Select Batch</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
@ -45,12 +45,12 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
Session
|
||||
Batch
|
||||
</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 Session</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.SessionID}}">{{itemBatch.SessionName}}</option>
|
||||
<option value="" selected>Select Batch</option>
|
||||
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
</th>
|
||||
<th>Specilization 2
|
||||
</th>
|
||||
<th>Session
|
||||
</th>
|
||||
<!--<th>Session
|
||||
</th>-->
|
||||
<th>Date of Joining
|
||||
</th>
|
||||
<th>
|
||||
@ -37,7 +37,7 @@
|
||||
<td>{{s.CourseName}}<span ng-show="s.CourseCode !=''">(<b>{{s.CourseCode}}</b>)</span></td>
|
||||
<td>{{s.Specilization1}}</td>
|
||||
<td>{{s.Specilization2}}</td>
|
||||
<td>{{s.SessionName}}</td>
|
||||
<!--<td>{{s.SessionName}}</td>-->
|
||||
<td>{{s.DOJ}}</td>
|
||||
<td ng-click="getStudentCourseDetails(s.ID)"><i class="fa fa-edit"></i></td>
|
||||
</tr>
|
||||
@ -95,7 +95,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
</label>
|
||||
@ -110,7 +110,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Session is required</span>
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
|
||||
@ -290,7 +290,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':FormAdd.batch.$dirty && FormAdd.batch.$invalid, 'has-success':FormAdd.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':FormAdd.batch.$dirty && FormAdd.batch.$invalid, 'has-success':FormAdd.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
@ -307,7 +307,7 @@
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="FormAdd.batch.$dirty && FormAdd.batch.$error.required">Session is required</span>
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
@ -659,7 +659,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
@ -676,7 +676,7 @@
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Batch is required</span>
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
<div class="row">
|
||||
<div ng-repeat="check in courseDataAdd" ng-if="check.CourseID==myModelCourseAdd.course">
|
||||
@ -1229,7 +1229,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$invalid, 'has-success':addCourseExistingStudentFORM.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$invalid, 'has-success':addCourseExistingStudentFORM.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
@ -1246,7 +1246,7 @@
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$error.required">Batch is required</span>
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
@ -681,7 +681,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
@ -698,7 +698,7 @@
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Session is required</span>
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
<div class="row">
|
||||
<div ng-repeat="check in courseDataAdd" ng-if="check.CourseID==myModelCourseAdd.course">
|
||||
@ -1264,7 +1264,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$invalid, 'has-success':addCourseExistingStudentFORM.batch.$valid}">
|
||||
<!--<div class="col-md-4 form-group" ng-class="{'has-error':addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$invalid, 'has-success':addCourseExistingStudentFORM.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Session <span class="symbol required"></span>
|
||||
@ -1281,7 +1281,7 @@
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="addCourseExistingStudentFORM.batch.$dirty && addCourseExistingStudentFORM.batch.$error.required">Session is required</span>
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user