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 2018-05-16 10:23:05 +05:30
commit 5cdfea66e6
9 changed files with 152 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/models/Login_model.php
View File

@ -30,11 +30,12 @@ class Login_model extends CI_Model
$this->db->where('t1.IsActive', 1);
//$this->db->where('t2.IsActive', 1);
$loginDetails = $this->db->get(LOGIN)->first_row();
$mobileno= $loginDetails->MobileNumber;
// print_r($loginDetails);
if($loginDetails) {
$mobileno= $loginDetails->MobileNumber;
if ($mobile == $loginDetails->MobileNumber || $mobile == $loginDetails->StaffID) {
if ($password == $loginDetails->Password) {

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

@ -453,7 +453,7 @@ class StatusUpdation_model extends CI_Model {
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.BranchID = '$branch'
AND SC.IsActive = '1'";
AND SC.IsActive = '1' GROUP BY SFS.StudentID ";
$queryDetails = $this->db->query($subQuery);
$results['searchResult'] = true;
$results['search_result_details'] = $queryDetails->result();
@ -462,12 +462,12 @@ class StatusUpdation_model extends CI_Model {
FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN " . STUDENTS_FEES_STATUS . " as SFS ON SFS.StudentID = SC.StudentID AND SC.BranchID = SFS.BranchCode
LEFT JOIN " . STUDENTS_FEES_STATUS . " as SFS ON SFS.StudentID = SC.StudentID AND SC.BranchID = SFS.BranchCode AND SFS.CourseID = C.CourseID
WHERE SFS.CourseID = SC.CourseID AND
SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'
AND S.IsActive = '1'
AND SC.BranchID = '$branch'
AND SC.IsActive = '1'";
AND SC.IsActive = '1' GROUP BY SFS.StudentID";
$queryDetails = $this->db->query($subQuery);
$results['searchResult'] = true;
$results['search_result_details'] = $queryDetails->result();

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

@ -573,7 +573,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
transformRequest: angular.identity,
headers: { 'Content-Type': undefined, 'Process-Data': false },
}).success(function (data) {
if (data.addStudentStatus == true) {
if (data.addStudentStatus === true) {
swal(" ", "Student added successfully.", "success");
$scope.disableButton = false;
$state.go($state.current, {}, { reload: true });
@ -598,7 +598,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
}
};
$http(req).then(function (response) {
if (response.data.addStudentStatus == true) {
if (response.data.addStudentStatus === true) {
swal(" ", "Student added successfully.", "success");
$scope.disableButton = false;
$state.go($state.current, {}, { reload: true });
@ -2398,7 +2398,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
swal(" ", "Student added successfully.", "success");
$scope.disableButton = false;
$scope.viewStudentDetailsPage = false;
// $state.go($state.current, {}, { reload: true });
$state.go($state.current, {}, { reload: true });
$scope.myActivateDiv();
// $scope.tabactive2 = false;
// $scope.viewStudentDetailsPage = false;
@ -2424,11 +2424,11 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
}
};
$http(req).then(function (response) {
if (response.data.addStudentStatus == true) {
if (response.data.addStudentStatus === true) {
swal("", "Student added successfully.", "success");
$scope.disableButton = false;
$scope.viewStudentDetailsPage = false;
// $state.go($state.current, {}, { reload: true });
$state.go($state.current, {}, { reload: true });
$scope.myActivateDiv();
// $scope.tabactive1 = true;
// $scope.tabactive2 = false;

30
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -180,6 +180,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -215,6 +223,21 @@
<th>Description/Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Course
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>University
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -247,6 +270,13 @@
</div>
</div>
</td>
<td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td>
<td> {{p.UniversityName}}</td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara"> {{p.ReceiptNoComments}}</div>
</td>
<td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td>
<!-- <td>

41
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -184,6 +184,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -216,15 +224,22 @@
<th ng-click="sort('PaidTo')">Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem/Course/University
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Description/Comments
<th>Description/Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Course</th>
<th>University</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -250,16 +265,20 @@
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}} </td>
<td>{{p.UniversityName}}</td>
<td>
<td>
<div id="containersPara">
<div id="wrapper">
{{p.PaidDescription}} / {{p.Description}}
</div>
</div>
</td>
<td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}} </td>
<td>{{p.UniversityName}}</td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">{{p.ReceiptNoComments}}</div> </td>
<td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td>
<!-- <td>

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

@ -91,6 +91,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -132,6 +140,12 @@
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -161,6 +175,10 @@
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara"> {{p.ReceiptNoComments}}</div>
</td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>

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

@ -91,6 +91,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -131,6 +139,12 @@
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
@ -162,6 +176,9 @@
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">{{p.ReceiptNoComments}}</div> </td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>

41
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -162,6 +162,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -194,17 +202,21 @@
<th ng-click="sort('PaidTo')">Paid To / Received From
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Description/Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Sem
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>Course</th>
<th>University</th>
<th>Description/Comments
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
@ -230,16 +242,23 @@
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td> {{p.FeePaymentDetails}}<br>{{p.CourseName}} <br> {{p.UniversityName}}</td>
<td>
<div id="containersPara">
<td>
<div class="containersPara">
<div id="wrapper">
{{p.PaidDescription}} / {{p.Description}}
</div>
</div>
</td>
<td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td><td> {{p.UniversityName}}</td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">
<div id="wrapper">{{p.ReceiptNoComments}}
</div>
</div>
</td>
<td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td>
<!-- <td>

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

@ -67,6 +67,14 @@
background-color: #5fba7d;
text-align: center;
}
.containersPara {
display: flex;
flex-direction: column;
max-height: 220px;
max-width: 140px;
overflow: auto;
background: #ddd;
}
</style>
<div class="row">
@ -107,6 +115,12 @@
</th>
<th ng-click="sort('TypeName')">Type
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
</th>
<th>
Receipt No
</th>
<th>
Comments
</th>
<th>Mode of Payment
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
@ -138,6 +152,9 @@
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">{{p.ReceiptNoComments}}</div> </td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>