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

student edit screen changes , student list course api changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-03-26 11:53:04 +05:30
parent dced4ac52f
commit 2cd9101cae
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/Student_model.php
View File

@ -460,7 +460,7 @@ class Student_model extends CI_Model
$this->db->join(''.STUDENTS_FEES_PAID.' as t6', 't6.FeesId = t5.FeesID', 'LEFT'); $this->db->join(''.STUDENTS_FEES_PAID.' as t6', 't6.FeesId = t5.FeesID', 'LEFT');
$this->db->where('t1.BranchID', $req['localBranchID']); $this->db->where('t1.BranchID', $req['localBranchID']);
$this->db->where('t1.StudentID', $studentId); $this->db->where('t1.StudentID', $studentId);
$this->db->group_by('t1.StudentID'); // $this->db->group_by('t1.StudentID');
$courseDetails = $this->db->get(); $courseDetails = $this->db->get();
$checkArr = $courseDetails->result(); $checkArr = $courseDetails->result();
if (count($checkArr) > 0) { if (count($checkArr) > 0) {

36
Apollo/assets/views/student/editStudentDetails.html
View File

@ -342,7 +342,7 @@
Referred By Referred By
</label> </label>
<input type="text" placeholder="Enter Refer's Name" tabindex="2022" class="form-control" name="referredby" ng-model="p.ReferredBy" <input type="text" placeholder="Enter Refer's Name" tabindex="2022" class="form-control" name="referredby" ng-model="p.ReferredBy"
ng-disabled="p.Fee_paid_cound > 0" ng-pattern="/^[a-zA-Z.\s]*$/" /> ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'" ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block" ng-if="Form.referredby.$dirty && Form.referredby.$error.pattern">Invalid Referred By </span> <span class="error text-small block" ng-if="Form.referredby.$dirty && Form.referredby.$error.pattern">Invalid Referred By </span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid}">
@ -350,7 +350,7 @@
Refer's Mobile Number Refer's Mobile Number
</label> </label>
<input type="text" name="referredmobilenumber" tabindex="2023" placeholder="Enter Refer's Mobile Number" class="form-control" <input type="text" name="referredmobilenumber" tabindex="2023" placeholder="Enter Refer's Mobile Number" class="form-control"
ng-disabled="p.Fee_paid_cound > 0" ng-model="p.ReferersMobileNumber" ng-minlength="10" ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'" ng-model="p.ReferersMobileNumber" ng-minlength="10"
ng-maxlength="12" ng-pattern="/^[0-9]*$/" /> ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
<span class="error text-small block" ng-if="Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid" ng-hide="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Refer's Mobile Number is required.</span> <span class="error text-small block" ng-if="Form.referredmobilenumber.$dirty && Form.referredmobilenumber.$invalid" ng-hide="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Refer's Mobile Number is required.</span>
<span class="error text-small block" ng-if="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Enter a Valid Phone Number</span> <span class="error text-small block" ng-if="Form.referredmobilenumber.$error.maxlength || Form.referredmobilenumber.$error.minlength || Form.referredmobilenumber.$error.pattern">Enter a Valid Phone Number</span>
@ -369,19 +369,45 @@
<label> <label>
Active/De-Active Active/De-Active
</label> </label>
<div ng-if="localUserType != 'R002'">
<div ng-if="p.IsActive==true" tabindex="2025"> <div ng-if="p.IsActive==true" tabindex="2025">
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch> <switch ng-model="p.IsActive"
is-diabled="true" ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'" ng-init="p.IsActive = true" class="green"></switch>
</div> </div>
<div ng-if="p.IsActive==false"> <div ng-if="p.IsActive==false">
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch> <switch ng-model="p.IsActive"
ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'"
is-diabled="true" ng-init="p.IsActive = false" class="green"></switch>
</div> </div>
</div>
<div ng-if="localUserType == 'R002'">
<div ng-if="p.Fee_paid_exist == 1 ">
<div ng-if="p.IsActive==true" tabindex="2025">
<lable> ACTIVE</lable>
<div ng-if="p.IsActive==false">
<lable> IN-ACTIVE</lable>
</div>
</div>
</div>
<div ng-if="p.Fee_paid_exist != 1 ">
<div ng-if="p.IsActive==true" tabindex="2025">
<switch ng-model="p.IsActive"
is-diabled="true" ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'" ng-init="p.IsActive = true" class="green"></switch>
</div>
<div ng-if="p.IsActive==false">
<switch ng-model="p.IsActive"
ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'"
is-diabled="true" ng-init="p.IsActive = false" class="green"></switch>
</div>
</div>
</div>
</div> </div>
<div class="col-md-4" ng-if="p.IsActive == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}"> <div class="col-md-4" ng-if="p.IsActive == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}">
<label> <label>
Reason for Deactivating <span class="symbol required"></span> Reason for Deactivating <span class="symbol required"></span>
</label> </label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="2026" class="form-control textdsc" name="DeactiveComments" <textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="2026" class="form-control textdsc" name="DeactiveComments"
ng-model="p.DeactiveComments" required></textarea> ng-disabled="p.Fee_paid_exist == 1 && localUserType == 'R002'" ng-model="p.DeactiveComments" required></textarea>
<span class="text-small block">Max 100 Characters.</span> <span class="text-small block">Max 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>