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

application status updation , master status list added : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-21 20:00:27 +05:30
parent b78f96a700
commit 954cbfc228
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,8 @@ class StatusUpdation_model extends CI_Model {
$searchFor = 'C001';
} else if ($reqDetails == 'ANSWERBOOKLET_STATUS') {
$searchFor = 'B001';
} else if ($reqDetails == 'APPICATIONFORM_STATUS') {
$searchFor = 'L001';
}
return $searchFor;
}
@ -937,7 +939,7 @@ class StatusUpdation_model extends CI_Model {
$courseId = $reqData['courseId'];
// echo $studentId;exit();
// $searchTableFor = APPLICATION_FORM;
$this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ');
$this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments');
$this->db->from('T_ApplicationFormStatus as t1');
$this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID');
$this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType');

1
Apollo/api/application/models/University_model.php
View File

@ -338,6 +338,7 @@ class University_model extends CI_Model
$this->db->or_where('ListGroup','7');
$this->db->or_where('ListGroup','8');
$this->db->or_where('ListGroup','9');
$this->db->or_where('ListGroup','12');
$defaultActivityDetails=$this->db->get(PICK_LIST_DETAILS);
if($defaultActivityDetails->result()){
$activity_result['activityStatus'] = true;

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

@ -30,7 +30,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'APPICATION_STATUS';
const localUpdateStatus = 'APPICATIONFORM_STATUS';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
@ -364,7 +364,7 @@ $scope.editStatusID = id;
$scope.statusUpdate = {
submit: function (form, localBranchDetails, id) {
// alert(id);
// alert(localBranchDetails);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;

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

@ -261,7 +261,7 @@
<td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>
</tr>
<tr ng-if="editStatusID == stufmtype.ID">
<td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, localBranchDetails, stufmtype.ID)" method="post">
<td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit1(Form, localBranchDetails, stufmtype.ID)" method="post">
<div class="container">
<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}">