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

latest New requirement updation: kdk

Browse Source
This commit is contained in:
resicovenba 2017-12-28 16:18:48 +05:30
parent aab6f1e222
commit bfa81ccd6a
19 changed files with 350 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/controllers/StatusUpdation_Controller.php
View File

@ -273,6 +273,8 @@ class StatusUpdation_Controller extends REST_Controller {
'Comments' => $reqData[$i]['Comments'],
'CreatedBy' => $reqDetails['localUserID'],
'CreatedOn' => $dateTime,
'CertificationType' => $reqData[$i]['CertificateType'],
'CertificationNo' =>$reqData[$i]['CertificateNumber'],
);
}

11
Apollo/api/application/controllers/Student_Controller.php
View File

@ -156,6 +156,7 @@ class Student_Controller extends REST_Controller {
$req['IsActive'] = $data['IsActive'];
$req['BranchID'] = $data['BranchID'];
$req['EnrollmentID'] = $data['EnrollmentID'];
$req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments'];
$req['UpdatedBy'] = $updatedBy;
$date = date('Y-m-d H:i:s');
$req['UpdatedOn'] = $date;
@ -217,6 +218,8 @@ class Student_Controller extends REST_Controller {
$req['ReferredBy'] = $data['ReferredBy'];
$req['ReferersMobileNumber'] = $data['ReferersMobileNumber'];
$req['ProfilePicPath'] = $data['ProfilePicPath'];
$req['Comments'] = $data['Comments'];
$req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments'];
$req['IsActive'] = $data['IsActive'];
@ -277,6 +280,8 @@ class Student_Controller extends REST_Controller {
$req['ReferredBy'] = $data['ReferredBy'];
$req['ReferersMobileNumber'] = $data['ReferersMobileNumber'];
$req['ProfilePicPath'] = $data['ProfilePicPath'];
$req['Comments'] = $data['Comments'];
$req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments'];
$req['IsActive'] = $data['IsActive'];
@ -415,8 +420,11 @@ class Student_Controller extends REST_Controller {
$req['ReferersMobileNumber'] = $data['referredmobilenumber'];
$req['PreQualification'] = $data['prequalification'];
$req['IsActive'] = $data['switchsetting'];
$req['Comments'] = $data['Comments'];
$req['BranchCode'] = $createdBranch;
$req['DeactiveComments'] = $data['switchsetting'] == 1 ? '': $data['DeactiveComments'];
$req['CreatedBy'] = $createdBy;
$date = date('Y-m-d H:i:s');
$req['CreatedOn'] = $date;
@ -484,8 +492,11 @@ class Student_Controller extends REST_Controller {
$req['ReferersMobileNumber'] = $data['referredmobilenumber'];
$req['PreQualification'] = $data['prequalification'];
$req['IsActive'] = $data['switchsetting'];
$req['Comments'] = $data['Comments'];
$req['BranchCode'] = $createdBranch;
$req['DeactiveComments'] = $data['switchsetting'] == 1 ? '': $data['DeactiveComments'];
$req['CreatedBy'] = $createdBy;
$date = date('Y-m-d H:i:s');
$req['CreatedOn'] = $date;

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

@ -57,6 +57,15 @@ class StatusUpdation_model extends CI_Model
public function update_applicationStatus($arr) {
$this->db->insert_batch(APPLICATION_STATUS, $arr);
if ($this->db->affected_rows() >= 1) {
if($this->get_ListCode_status($arr[0]['ListCode'])){
$dateToMsg = $arr[0]['AppDate'];
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
$cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
$mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
$this->smssend($arr, $mesg);
}
$result['addStatus'] = true;
$result['message'] = "Successfully Certification Status Updated";
$result['addStatus'] = true;
$result['message'] = "Successfully Application Status Updated";
} else {
@ -161,7 +170,7 @@ class StatusUpdation_model extends CI_Model
} else if ( $reqDetailsFor == 'APPICATION_STATUS' ) {
$searchFor = 'A001';
$searchTableFor = APPLICATION_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName');
$this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');
$this->db->from(''. $searchTableFor . ' as t1');
$this->db->where('t1.StudentID', $reqDetails['student']);
// $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
@ -169,6 +178,7 @@ class StatusUpdation_model extends CI_Model
$this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT');
$this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT');
$this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT');
$this->db->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT');
$this->db->order_by('t1.CreatedOn', 'DESC');
$statusDetails = $this->db->get();
$prevStatusDetails = $statusDetails->result();

3
Apollo/assets/js/controllers/answerBookletStatusCtrl.js
View File

@ -269,6 +269,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
@ -305,11 +306,13 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) {
swal("Success!", response.data.message, "success");
$scope.disableButton = false;
// for success state
$scope.allSelected('undefined');
$scope.OpenWindowStatus = false;
} else {
swal("Failed!", response.data.message, "error");
$scope.disableButton = false;
}
});
}

94
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -30,7 +30,29 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.init = function () {
$scope.getUniversityList();
getCertificateDetailsList();
}
var getCertificateDetailsList = function() {
var getCerfreg = {
method: 'POST',
url: apiPoint.url + 'getCertificateList/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(getCerfreg).then(function (response) {
if (response.data.certificateStatus) {
$scope.certificateData = response.data.certificate_details;
// alert(JSON.stringify($scope.certificateData));
} else {
}
});
}
$scope.searchData = {
'University': '',
@ -44,7 +66,9 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
'semYear': '',
'staus': '',
'dateOn': '',
'comment': ''
'comment': '',
'certificatetype': '',
'certificateNumber': ''
}
$scope.universityData = '';
@ -136,29 +160,41 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// select all or individual functionality
var getAllSelected = function () {
var selectedItems = $scope.searchResultDetails.filter(function (item) {
return item.Selected;
});
// var getAllSelected = function () {
// var selectedItems = $scope.searchResultDetails.filter(function (item) {
// return item.Selected;
// });
return selectedItems.length === $scope.searchResultDetails.length;
}
// return selectedItems.length === $scope.searchResultDetails.length;
// }
var setAllSelected = function (value) {
// var setAllSelected = function (value) {
// angular.forEach($scope.searchResultDetails, function (item) {
// item.Selected = value;
// });
// }
// $scope.allSelected = function (value) {
// if (value !== undefined) {
// return setAllSelected(value);
// } else {
// return getAllSelected();
// }
// }
// End: select all or individual functionality
// Select one row in a table once
$scope.setOneSelect = function (value) {
// alert(value.Selected);
angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = value;
});
value.Selected = true;
$scope.OpenWindowStatus = true;
$scope.openUpdateWind();
}
$scope.allSelected = function (value) {
if (value !== undefined) {
return setAllSelected(value);
} else {
return getAllSelected();
}
}
// End: select all or individual functionality
// open popup window onselct checkbox
@ -177,7 +213,9 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
'semYear': '',
'staus': '',
'dateOn': '',
'comment': ''
'comment': '',
'certificatetype': '',
'certificateNumber': ''
}
} else {
$scope.OpenWindowStatus = false;
@ -269,6 +307,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
@ -287,6 +326,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
this.SDate = $scope.myStatusModel.dateOn;
this.Coursedetail = id;
this.Comments = $scope.myStatusModel.comment;
this.CertificateType = $scope.myStatusModel.certificatetype;
this.CertificateNumber = $scope.myStatusModel.certificateNumber;
}
// alert(JSON.stringify($scope.myStatusModel));
// alert(JSON.stringify(studentForUpdate));
@ -305,11 +346,22 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) {
swal("Success!", response.data.message, "success");
$scope.disableButton = false;
// for success state
$scope.allSelected('undefined');
angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false;
});
// $scope.OpenWindowStatus = false;
$scope.OpenWindowStatus = false;
} else {
swal("Failed!", response.data.message, "error");
$scope.disableButton = false;
// for success state
angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false;
});
// $scope.OpenWindowStatus = false;
$scope.OpenWindowStatus = false;
}
});
}
@ -320,7 +372,9 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
'semYear': '',
'staus': '',
'dateOn': '',
'comment': ''
'comment': '',
'certificatetype': '',
'certificateNumber': ''
}
}
}

3
Apollo/assets/js/controllers/certificationStatusCtrl.js
View File

@ -311,6 +311,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
@ -350,6 +351,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$http(updateCertificateStatus).then(function (response) {
if (response.data.addStatus) {
swal("Success!", response.data.message, "success");
$scope.disableButton = false;
// for success state
// $scope.allSelected('undefined');
angular.forEach($scope.searchResultDetails, function (item) {
@ -358,6 +360,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.OpenWindowStatus = false;
} else {
swal("Failed!", response.data.message, "error");
$scope.disableButton = false;
}
});
}

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

@ -35,6 +35,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
'referredby': '',
'referredmobilenumber': '',
'switchsetting': true,
'DeactiveComments': '',
'Comments': ''
};
$scope.myModelCourse = {
@ -483,8 +485,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.files.length = 0;
$scope.stepsModel.length = 0;
}
$scope.getChangeDate = function() {
$scope.getChangeDate = function() {
var formate = "dd-MM-yyyy";
$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
@ -508,11 +510,10 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
} else {
$scope.disableButton = true;
var formate = "dd-MM-yyyy";
$scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0;
//$scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate);
$scope.myModelCourseAdd.dateofjoining = $filter('date')(new Date($scope.myModelCourseAdd.dateofjoining), formate);
var idStuProof = $scope.files[0];
@ -591,6 +592,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
'dateofjoining': '',
'role': '',
'switchsetting': true,
'DeactiveComments': '',
'Comments': ''
};
}, resetCourse: function (form) {
form.$setPristine(true);

3
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -268,6 +268,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
@ -304,11 +305,13 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$http(updateStudyMaterial).then(function (response) {
if (response.data.addStatus) {
swal("Success!", response.data.message, "success");
$scope.disableButton = false;
// for success state
$scope.allSelected('undefined');
$scope.OpenWindowStatus = false;
} else {
swal("Failed!", response.data.message, "error");
$scope.disableButton = false;
}
});
}

4
Apollo/assets/views/daybook/daybook.html
View File

@ -157,7 +157,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
maxlength="100" />
<span class="text-small block">Comments Should Less than 100 Charactes.</span>
<span class="text-small block">Comments Should be Less than 100 Charactes.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
@ -256,7 +256,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="addComments" ng-model="myModelAdd.description"
maxlength="100" />
<span class="text-small block">Comments Should Less than 100 Characters.</span>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.addComments.$dirty && Form.addComments.$error.pattern">Invalid Comments</span>
</div>

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -220,7 +220,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" />
<span class="text-small block">Comments Should Less than 100 Characters.</span>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
</div>

2
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -217,7 +217,7 @@
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="description" ng-model="myStatusModel.description"
maxlength="100" />
<span class="text-small block">Comments Should Less than 100 Characters.</span>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
</div>

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

@ -288,8 +288,8 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Submit
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset

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

@ -94,25 +94,25 @@
<div class="container">
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
<label for="form-field-select-2">
Mobile Number
</label>
<script>
<script>
$(function () {
$("#search").focus();
});
</script>
<style>
.sort-icon {
font-size: 9px;
margin-left: 5px;
}
<style>
.sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
}
</style>
th {
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>
</div>
@ -122,8 +122,8 @@
<thead>
<tr>
<th>
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
/>
<!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
/>-->
</th>
<th ng-click="sort('Firstname')">First Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
@ -147,7 +147,7 @@
<tr>
<td>
<label>
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
<input type="checkbox" ng-model="p.Selected" ng-click="setOneSelect(p)" />
<!--{{p.StudentID}}-->
</label>
</td>
@ -155,8 +155,8 @@
<td>{{p.Lastname}}</td>
<td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td>
<td>{{p.CourseName}}</td>
<td class="center">
<td>{{p.CourseName}}</td>
<td class="center">
<span> <i tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt" ng-click="setEditId(p.StudentID)"></i> </span>
</td>
</tr>
@ -175,12 +175,14 @@
<thead style="background-color: cadetblue">
<th>Status</th>
<th>Comments</th>
<th>Application Name</th>
<th>Date</th>
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.CertificateName}}</td>
<td>{{s.AppDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>
@ -218,6 +220,30 @@
<legend>
Update Status
</legend>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
<label for="form-field-select-2">
Application Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required>
<option value="" disabled selected>Select Application Type</option>
<option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label>
Application Number
</label>
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Application Number" class="form-control" ng-model="myStatusModel.certificateNumber"
/>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Status is Required </span>
</div>
</div>
<div class="row">
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
@ -289,8 +315,8 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Submit
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset

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

@ -313,8 +313,8 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Submit
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset

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

@ -292,7 +292,8 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i>
Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">

14
Apollo/assets/views/student/editStudentCourseDetails.html
View File

@ -126,8 +126,9 @@
/>
<span class="error text-small block" ng-if="Form.enrollmentid.$dirty && Form.enrollmentid.$error.required">Enrollment ID required</span>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-4">
<label>
Active/De-Active
</label>
@ -138,7 +139,16 @@
<switch ng-model="stucour.IsActive" ng-init="stucour.IsActive = false" class="green"></switch>
</div>
</div>
<div class="col-md-4" ng-if="stucour.IsActive == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}">
<label>
Reason for Deactivating <span class="symbol required"></span>
</label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments" ng-model="stucour.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div>
</div>
<input type="hidden" ng-init="hidden_DOJ=stucour.DOJ" ng-model="hidden_DOJ">
<div class="row">

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

@ -7,74 +7,85 @@
Personal Details
</legend>
<div class="row">
<div class="right">
<img class="thumb prof" ng-src="images/{{p.ProfilePicPath}}" />
<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.prof {
border: 2px solid #2C3543;
}
.uploader {
clear: both;
}
</style>
<div class="col-md-7">
</div>
<div class="right" >
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="file-upload">
<div class="row">
<div class="col-md-4">
<h5>Update Profile Picture</h5>
<div class=" margin-bottom-5">
</div>
<input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
/>
</div>
<div class="col-md-2">
<div class="form-group">
<div class="user-image">
<div class="col-md-5">
<div class="row">
<div class="col-md-4">
<style>
.thumb {
width: 90px;
height: 115px;
margin: 18px;
float: left;
}
.prof {
border: 2px solid #2C3543;
}
.uploader {
clear: both;
}
</style>
<img class="thumb prof" ng-src="images/{{p.ProfilePicPath}}" />
</div>
<div class="col-md-8">
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="file-upload">
<div class="row">
<div class="col-md-12">
<label>Update Profile Picture</label>
<div class=" margin-bottom-5">
</div>
<input type="file" accept="image/*" ng-init="resetImageEdit()" file-upload-edit onchange="angular.element(this).scope().imageUploadEdit(event)"
/>
</div>
<!--<input type="file" file-model="idProof"
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="user-image">
</div>
<!--<input type="file" file-model="idProof"
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
<div>
<div ng-repeat="step in stepsModelEdit">
<!--<a class="close-thin"></a>-->
<img class="thumb" ng-src="{{step}}" />
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset
<div>
<div ng-repeat="step in stepsModelEdit">
<!--<a class="close-thin"></a>-->
<img class="thumb" ng-src="{{step}}" />
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImageEdit()">Reset
</button>
</div>
</div>
</div>
</div>
<style>
.thumb {
width: 90px;
height: 115px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div>
</div>
<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div>
</div>
</div>
</form>
</div>
</form>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
@ -132,7 +143,7 @@
Email ID <span class="symbol required"></span>
</label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required>
ng-model="p.EmailID" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div>
@ -329,6 +340,14 @@
<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>
</div>
<div class="col-md-4">
<label>
Comments
</label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="p.Comments"></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div>
</div>
<div class="row">
<div class="col-md-4">
@ -342,13 +361,15 @@
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
</div>
</div>
<!--<div class="col-md-4" ng-if="p.IsActive == false" >
<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>
De-Active Comments <span class="symbol required"></span>
Reason for Deactivating <span class="symbol required"></span>
</label>
<textarea placeholder="Enter Permanent Address" tabindex="10" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div>-->
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="25" class="form-control textdsc" name="DeactiveComments"
ng-model="p.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div>
</div>
</div>
@ -434,13 +455,13 @@
<div class="col-md-12">
<div class="pull-right">
<button type="button" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p)">
Submit
Submit
</button>
<button type="reset" class="btn btn-warning btn-wide" tabindex="9" ng-click="branchForm.reset(Form)">
Reset
</button>
</div>
</div>
</div>
</div>
</fieldset>-->

142
Apollo/assets/views/student/student_details.html
View File

@ -46,17 +46,20 @@
<table class="table table-hover">
<thead>
<tr>
<th ng-click="sort('Firstname')">First Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('Lastname')">Last Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('MobileNumber')">MobileNumber
<span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('EmailID')">Email ID
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
<th ng-click="sort('Firstname')">Student Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('Fathername')">Father Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('Fathername')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th>Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Fathername'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th style="text-align: center;"> Details
</th>
@ -64,10 +67,12 @@
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.Firstname}}</td>
<td>{{p.Lastname}}</td>
<td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td>
<td>{{p.Firstname}} {{p.Lastname}}</td>
<td>{{p.Fathername}}</td>
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
<td>{{p.Comments}}</td>
<td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
ng-click="setEditId(p.StudentID);">
@ -117,6 +122,59 @@
<legend>
Personal Details
</legend>
<div class="row">
<div class="col-md-8">
</div>
<div class="col-md-4">
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="file-upload">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="user-image">
<h5>Profile Picture</h5>
<div class=" margin-bottom-5">
</div>
</div>
<!--<input type="file" file-model="idProof"
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
<input type="file" ng-init="resetImage()" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)"
/>
<style>
.thumb {
width: 90px;
height: 115px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div>
</div>
<div class="col-md-6">
<div>
<div ng-repeat="step in stepsModel">
<!--<a class="close-thin"></a>-->
<img class="thumb" ng-src="{{step}}" />
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
<label>
@ -173,7 +231,7 @@
Email ID <span class="symbol required"></span>
</label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="myModel.emailId" ng-blur='checkEmailExist()' required>
ng-model="myModel.emailId" required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div>
@ -377,6 +435,14 @@
<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>
</div>
<div class="col-md-4">
<label>
Comments
</label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="26" class="form-control textdsc" name="Comments" ng-model="myModel.Comments"></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div>
</div>
<div class="row">
<div class="col-md-4">
@ -396,50 +462,14 @@
</div>
</div>
</div>
<div class="col-md-4">
<form name="Form" id="form1" novalidate ng-submit="form.submit(Form,myModel)" method="post">
<div class="file-upload">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="user-image">
<h5>Profile Picture</h5>
<div class=" margin-bottom-5">
</div>
</div>
<!--<input type="file" file-model="idProof"
accept="image/*" onchange="angular.element(this).scope().imageUpload(event)"/>-->
<div>
<div ng-repeat="step in stepsModel">
<!--<a class="close-thin"></a>-->
<img class="thumb" ng-src="{{step}}" />
<div class="col-md-12">
<div class="pull-right">
<button class="btn btn-success btn-o btn-sm margin-right-15" type="button" ng-click="resetImage()">Reset
</button>
</div>
</div>
</div>
</div>
<input type="file" ng-init="resetImage()" accept="image/*" file-upload onchange="angular.element(this).scope().imageUpload(event)"
/>
<style>
.thumb {
width: 130px;
height: 140px;
margin: 18px;
float: left;
}
.uploader {
clear: both;
}
</style>
</div>
</div>
</div>
</div>
</form>
<div class="col-md-4" ng-if="myModel.switchsetting == false" ng-class="{'has-error':Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid, 'has-success':Form.DeactiveComments.$valid}">
<label>
Reason for Deactivating <span class="symbol required"></span>
</label>
<textarea maxlength="100" placeholder="Reason for Deactivating" tabindex="27" class="form-control textdsc" name="DeactiveComments"
ng-model="myModel.DeactiveComments" required></textarea>
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div>
</div>
<!--<div class="row">

BIN
Apollo/images/student/Dri_HtrjvpNQzx0O.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB