Merge remote-tracking branch 'origin/master'
This commit is contained in:
gandhimathi
commit
70a955ae65
@ -230,7 +230,8 @@ class StatusUpdation_Controller extends REST_Controller {
|
||||
'Comments' => $reqData[$i]['Comments'],
|
||||
'CreatedBy' => $reqDetails['localUserID'],
|
||||
'CreatedOn' => $dateTime,
|
||||
'CertificationType' => $reqData[$i]['CertificateType'],
|
||||
// 'CertificationType' => $reqData[$i]['CertificateType'],
|
||||
'CertificationType' => 'MARK CARD',
|
||||
'CertificationNo' =>$reqData[$i]['CertificateNumber'],
|
||||
);
|
||||
}
|
||||
|
||||
@ -64,10 +64,10 @@ class StatusUpdation_model extends CI_Model
|
||||
$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 Certification Status Updated";
|
||||
$result['addStatus'] = true;
|
||||
$result['message'] = "Successfully Application Status Updated";
|
||||
$result['message'] = "Successfully Documents Status Updated";
|
||||
} else {
|
||||
$result['addStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
@ -87,12 +87,13 @@ class StatusUpdation_model extends CI_Model
|
||||
if($this->get_ListCode_status($arr[0]['ListCode'])){
|
||||
$dateToMsg = $arr[0]['CDate'];
|
||||
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
|
||||
$cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
|
||||
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
|
||||
$cerNamtToMsg = 'MARK CARD';
|
||||
$mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
|
||||
$this->smssend($arr, $mesg);
|
||||
}
|
||||
$result['addStatus'] = true;
|
||||
$result['message'] = "Successfully Certification Status Updated";
|
||||
$result['message'] = "Successfully Mark Card Status Updated";
|
||||
} else {
|
||||
$result['addStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
@ -192,7 +193,7 @@ class StatusUpdation_model extends CI_Model
|
||||
} else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) {
|
||||
$searchFor = 'C001';
|
||||
$searchTableFor = CERTIFICATION_STATUS;
|
||||
$this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');
|
||||
$this->db->select('t1.*, t4.Firstname, t5.ListName');
|
||||
$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');
|
||||
@ -200,7 +201,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->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT');
|
||||
$this->db->order_by('t1.CreatedOn', 'DESC');
|
||||
$statusDetails = $this->db->get();
|
||||
$prevStatusDetails = $statusDetails->result();
|
||||
|
||||
@ -80,8 +80,8 @@
|
||||
"MAIN": "STATUS UPDATE",
|
||||
"STUDYMATERIAL": "STUDY MATERIAL",
|
||||
"ANSWERBOOKLET": "ANSWER BOOKLET",
|
||||
"CERTIFICATION": "CERTIFICATION",
|
||||
"APPLICATION" : "APPLICATION"
|
||||
"CERTIFICATION": "MARK CARD",
|
||||
"APPLICATION" : "DOCUMENTS"
|
||||
}
|
||||
},
|
||||
"status": {
|
||||
|
||||
@ -249,19 +249,19 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
}).state('app.student.status.certificationstatus', {
|
||||
url: '/certificationstatus',
|
||||
templateUrl: "assets/views/status-update/certification_status.html",
|
||||
title: 'Certification',
|
||||
title: 'Mark Card',
|
||||
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'),
|
||||
ncyBreadcrumb: {
|
||||
label: 'Certification'
|
||||
label: 'Mark Card'
|
||||
},
|
||||
// resolve: loadSequence('wizardCtrl')
|
||||
}).state('app.student.status.applicationstatus', {
|
||||
url: '/applicationstatus',
|
||||
templateUrl: "assets/views/status-update/application_status.html",
|
||||
title: 'Application Status',
|
||||
title: 'Documents Status',
|
||||
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'),
|
||||
ncyBreadcrumb: {
|
||||
label: 'Application Status'
|
||||
label: 'Documents Status'
|
||||
},
|
||||
// resolve: loadSequence('wizardCtrl')
|
||||
}).state('app.status.application', {
|
||||
|
||||
@ -29,7 +29,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
||||
|
||||
$scope.init = function () {
|
||||
$scope.getUniversityList();
|
||||
$scope.getCertificateList();
|
||||
// $scope.getCertificateList();
|
||||
}
|
||||
|
||||
$scope.searchData = {
|
||||
|
||||
@ -175,7 +175,7 @@
|
||||
<thead style="background-color: cadetblue">
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
<th>Application Name</th>
|
||||
<th>Document Name</th>
|
||||
<th>Date</th>
|
||||
<th>Updated By</th>
|
||||
</thead>
|
||||
@ -223,25 +223,25 @@
|
||||
<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>
|
||||
Document 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 value="" disabled selected>Select Document 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>
|
||||
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document 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
|
||||
Document Number
|
||||
|
||||
</label>
|
||||
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Application Number" class="form-control" ng-model="myStatusModel.certificateNumber"
|
||||
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document 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>
|
||||
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
@ -173,14 +173,16 @@
|
||||
<thead style="background-color: cadetblue">
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
<th>Certificate Name</th>
|
||||
<th>Type</th>
|
||||
<th>Mark Card Number</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.CertificationType}}</td>
|
||||
<td>{{s.CertificationNo}}</td>
|
||||
<td>{{s.CDate}}</td>
|
||||
<td>{{s.Firstname}}</td>
|
||||
</tbody>
|
||||
@ -219,7 +221,7 @@
|
||||
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}">
|
||||
<!--<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">
|
||||
Certificate Type <span class="symbol required"></span>
|
||||
</label>
|
||||
@ -231,19 +233,8 @@
|
||||
</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>
|
||||
Certificate Number
|
||||
|
||||
</label>
|
||||
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Certificate 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}">
|
||||
</div>-->
|
||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
||||
<label for="form-field-select-2">
|
||||
Sem/Year <span class="symbol required"></span>
|
||||
</label>
|
||||
@ -256,7 +247,19 @@
|
||||
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
|
||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
|
||||
<label>
|
||||
Mark Card Number
|
||||
|
||||
</label>
|
||||
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Mark Card Number" class="form-control" ng-model="myStatusModel.certificateNumber"
|
||||
/>
|
||||
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Number is Required </span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
|
||||
<label for="form-field-select-2">
|
||||
Status <span class="symbol required"></span>
|
||||
</label>
|
||||
@ -279,7 +282,7 @@
|
||||
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
|
||||
</div>-->
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
|
||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
|
||||
<label>
|
||||
Date <span
|
||||
class="symbol required"></span>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user