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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2017-12-29 16:14:48 +05:30
commit 70a955ae65
7 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -64,10 +64,10 @@ class StatusUpdation_model extends CI_Model
$mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg."; $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
$this->smssend($arr, $mesg); $this->smssend($arr, $mesg);
} }
// $result['addStatus'] = true;
// $result['message'] = "Successfully Certification Status Updated";
$result['addStatus'] = true; $result['addStatus'] = true;
$result['message'] = "Successfully Certification Status Updated"; $result['message'] = "Successfully Documents Status Updated";
$result['addStatus'] = true;
$result['message'] = "Successfully Application Status Updated";
} else { } else {
$result['addStatus'] = false; $result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $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'])){ if($this->get_ListCode_status($arr[0]['ListCode'])){
$dateToMsg = $arr[0]['CDate']; $dateToMsg = $arr[0]['CDate'];
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); $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."; $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
$this->smssend($arr, $mesg); $this->smssend($arr, $mesg);
} }
$result['addStatus'] = true; $result['addStatus'] = true;
$result['message'] = "Successfully Certification Status Updated"; $result['message'] = "Successfully Mark Card Status Updated";
} else { } else {
$result['addStatus'] = false; $result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
@ -192,7 +193,7 @@ class StatusUpdation_model extends CI_Model
} else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) { } else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) {
$searchFor = 'C001'; $searchFor = 'C001';
$searchTableFor = CERTIFICATION_STATUS; $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->from(''. $searchTableFor . ' as t1');
$this->db->where('t1.StudentID', $reqDetails['student']); $this->db->where('t1.StudentID', $reqDetails['student']);
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); $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('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT');
$this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', '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('' . 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'); $this->db->order_by('t1.CreatedOn', 'DESC');
$statusDetails = $this->db->get(); $statusDetails = $this->db->get();
$prevStatusDetails = $statusDetails->result(); $prevStatusDetails = $statusDetails->result();

4
Apollo/assets/i18n/en.json
View File

@ -80,8 +80,8 @@
"MAIN": "STATUS UPDATE", "MAIN": "STATUS UPDATE",
"STUDYMATERIAL": "STUDY MATERIAL", "STUDYMATERIAL": "STUDY MATERIAL",
"ANSWERBOOKLET": "ANSWER BOOKLET", "ANSWERBOOKLET": "ANSWER BOOKLET",
"CERTIFICATION": "CERTIFICATION", "CERTIFICATION": "MARK CARD",
"APPLICATION" : "APPLICATION" "APPLICATION" : "DOCUMENTS"
} }
}, },
"status": { "status": {

8
Apollo/assets/js/config.router.js
View File

@ -249,19 +249,19 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
}).state('app.student.status.certificationstatus', { }).state('app.student.status.certificationstatus', {
url: '/certificationstatus', url: '/certificationstatus',
templateUrl: "assets/views/status-update/certification_status.html", 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'), resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Certification' label: 'Mark Card'
}, },
// resolve: loadSequence('wizardCtrl') // resolve: loadSequence('wizardCtrl')
}).state('app.student.status.applicationstatus', { }).state('app.student.status.applicationstatus', {
url: '/applicationstatus', url: '/applicationstatus',
templateUrl: "assets/views/status-update/application_status.html", 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'), resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Application Status' label: 'Documents Status'
}, },
// resolve: loadSequence('wizardCtrl') // resolve: loadSequence('wizardCtrl')
}).state('app.status.application', { }).state('app.status.application', {

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

@ -29,7 +29,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.init = function () { $scope.init = function () {
$scope.getUniversityList(); $scope.getUniversityList();
$scope.getCertificateList(); // $scope.getCertificateList();
} }
$scope.searchData = { $scope.searchData = {

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

@ -175,7 +175,7 @@
<thead style="background-color: cadetblue"> <thead style="background-color: cadetblue">
<th>Status</th> <th>Status</th>
<th>Comments</th> <th>Comments</th>
<th>Application Name</th> <th>Document Name</th>
<th>Date</th> <th>Date</th>
<th>Updated By</th> <th>Updated By</th>
</thead> </thead>
@ -223,25 +223,25 @@
<div class="row"> <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"> <label for="form-field-select-2">
Application Type <span class="symbol required"></span> Document Type <span class="symbol required"></span>
</label> </label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype" <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required> 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> <option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select> </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>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label> <label>
Application Number Document Number
</label> </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> </div>
<div class="row"> <div class="row">

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

@ -173,14 +173,16 @@
<thead style="background-color: cadetblue"> <thead style="background-color: cadetblue">
<th>Status</th> <th>Status</th>
<th>Comments</th> <th>Comments</th>
<th>Certificate Name</th> <th>Type</th>
<th>Mark Card Number</th>
<th>Date</th> <th>Date</th>
<th>Updated By</th> <th>Updated By</th>
</thead> </thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse"> <tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td> <td>{{s.ListName}}</td>
<td>{{s.Comments}}</td> <td>{{s.Comments}}</td>
<td>{{s.CertificateName}}</td> <td>{{s.CertificationType}}</td>
<td>{{s.CertificationNo}}</td>
<td>{{s.CDate}}</td> <td>{{s.CDate}}</td>
<td>{{s.Firstname}}</td> <td>{{s.Firstname}}</td>
</tbody> </tbody>
@ -219,7 +221,7 @@
Update Status Update Status
</legend> </legend>
<div class="row"> <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"> <label for="form-field-select-2">
Certificate Type <span class="symbol required"></span> Certificate Type <span class="symbol required"></span>
</label> </label>
@ -231,19 +233,8 @@
</select> </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">Certificate Type is Required</span>
</div> </div>-->
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<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}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Sem/Year <span class="symbol required"></span> Sem/Year <span class="symbol required"></span>
</label> </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> <span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div> </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"> <label for="form-field-select-2">
Status <span class="symbol required"></span> Status <span class="symbol required"></span>
</label> </label>
@ -279,7 +282,7 @@
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span> <span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>--> </div>-->
<div data-ng-controller="DatepickerDemoCtrl"> <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> <label>
Date <span Date <span
class="symbol required"></span> class="symbol required"></span>