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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gandhimathi 2018-08-21 12:10:19 +05:30
commit ca4d8df140
22 changed files with 106 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/controllers/Report.php
View File

@ -385,8 +385,6 @@ class Report extends REST_Controller {
}
public function getAllUniversity_post()
{
@ -446,6 +444,4 @@ class Report extends REST_Controller {
}

17
Apollo/api/application/models/Hallticket_model.php
View File

@ -810,7 +810,7 @@ class Hallticket_model extends CI_Model
}
array_splice($id['FeeDetails'][$key2],0,6,$in1);
array_splice($id['FeeDetails'][$key2],0,6,$in1[0]);
}
@ -832,7 +832,7 @@ class Hallticket_model extends CI_Model
// }
array_splice($id['FeeDetails'][$key2],0,6,$in2);
array_splice($id['FeeDetails'][$key2],0,6,$in2[0]);
}
@ -854,7 +854,7 @@ class Hallticket_model extends CI_Model
// }
array_splice($id['FeeDetails'][$key2],0,6,$in3);
array_splice($id['FeeDetails'][$key2],0,6,$in3[0]);
}
@ -876,7 +876,7 @@ class Hallticket_model extends CI_Model
// }
array_splice($id['FeeDetails'][$key2],0,6,$in4);
array_splice($id['FeeDetails'][$key2],0,6,$in4[0]);
}
$studentIDs['NUMTYPE'] = 'YEAR';
@ -1031,8 +1031,10 @@ class Hallticket_model extends CI_Model
{
foreach($studentIDs as $student)
{
if(!empty($student['FeeDetails']))
{
foreach($student['FeeDetails'][0] as $key => $fees)
{
@ -1045,16 +1047,13 @@ class Hallticket_model extends CI_Model
$HallTicketStudentID = $this->db->insert_id();
$this->db->trans_complete();
foreach($fees as $subject)
{
$tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime);
$tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$fees->SubjectID,'ExamDate'=>$fees->ScheduleDate,'FromTime'=>$fees->FromTime,'EndTime'=>$fees->ToTime);
$this->db->trans_start();
$this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray);
$this->db->trans_complete();
}
}
}
}

47
Apollo/api/application/models/Reports_model.php
View File

@ -34,7 +34,7 @@ order by CourseID) as cm
on cm.cid=cfd.ccid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
where sms.branch = '".$br."'
";
@ -433,26 +433,24 @@ group by sid
}
public function app_pending($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
sms.adate as appdate,ifnull(reg.formtype,'-') as formtype,sfs.batch as batch
from
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app
(SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,app.CertificationType as ctype,CertificateName as certname
FROM T_ApplicationStatus as app
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
left join T_PickListDetails list on list.ListCode=app.ListCode
where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
group by sid,cid,lcode,branch) as sms
where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType,ListCode)
group by sid,cid,lcode,branch,ctype) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype, sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others
FROM T_Students_Fees_Status
group by sid,fid,cid,batch)
as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid
(select StudentID as sid,CourseID as cid,BatchCode as batch,FeesID as fid from T_Students_Fees_Status) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
left join
(SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
group by sid,fid,billno)
as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
as sfp on sfp.sid=sfs.sid and sfs.fid=sfp.fid
left join
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid
left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,
UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
@ -463,6 +461,9 @@ left join
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch
left join
(Select StudentID as sid,CourseID as cid,BatchCode as bcode,FeeType as ftype,BranchCode as branch,RegistrationType as formtype from T_Registration_Details) as reg on reg.sid=sms.sid and reg.cid=sms.cid
where std.active = 1 and sms.branch = '".$br."'
";
@ -476,7 +477,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql.=" and cm.uid = '".$u."'";
}
$sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year";
$sql.=" group by Student_id,Course_id,Branch_code,Sem_year";
@ -618,26 +619,23 @@ left join
}
public function examfee($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfs.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts,BranchCode as branch FROM T_Students_Fees_Status
where STFOrWR != ''
group by sid,batch,cid) as sms
group by sid,fid,batch,cid) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status
group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
left join
(SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sfs.cid
(SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
left join
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=scd.cid and cfd.cid=sfs.ftype
(SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid and cfd.cid=sms.ftype
left join
(SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,
UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm
left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID
group by cid
order by CourseID)
as cm on cm.cid=cfd.ccid
as cm on cm.cid=sms.cid
left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
where std.active = 1 and sms.branch = '".$br."'
@ -646,7 +644,7 @@ left join
if ($bat!= ''){
$sql.=" and sfs.batch = '".$bat."'";
$sql.=" and sms.batch = '".$bat."'";
}
if ($u!= ''){
@ -837,9 +835,6 @@ from T_Lead_Tracking_Followup as ltf
$batchDetails = $this->db->get(BATCH);
return $batchDetails->result();
}
public function GetAllUniversity($branchId)
{
$this->db->select('UniversityID,UniversityName');
@ -886,7 +881,7 @@ left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_
left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=?';
$query = $this->db->query($subQuery,array(NewReg,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1'));
$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1'));
$searchDetails =$query->result();

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

@ -83,10 +83,10 @@
"studmatstatus": "STUDY MATERIAL STATUS ",
"mstatus": "MARK CARD STATUS ",
"certificate_status": "CERTIFICATE STATUS ",
"certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ",
"certificate_mark_status": "MARKS CARD/ CERTIFICATES - RECEIVED/ ISSUED STATUS REPORT",
"expense": "EXPENSE REPORT ",
"answer_booklets": "ANSWER BOOKLETS STATUS REPORT ",
"app_pending": "APPLICATION PENDING STUDENT LIST REPORT",
"app_pending": "NEW & RE-REG FORM STATUS REPORT",
"doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
"wav_ref": "WAIVER AND REFERAL REPORT",
"examfee": "EXAM WRITING FEE REPORT",

27
Apollo/assets/js/controllers/datacorrectionCtrl.js
View File

@ -132,23 +132,32 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter"
$scope.updatestatus = function (myModel, form, loading)
{
//alert(myModel.ID)
//alert(myModel.Reason);
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
swal("Please Enter Reason!", "", "error");
} else {
var d = new Date(myModel.Date);
// console.log(d.getUTCDate()); // Hours
// console.log(d.getUTCMonth());
// console.log(d.getUTCFullYear());
var mdate = d.getUTCDate() + 1;
var mmonth = d.getUTCMonth() + 1;
var myear = d.getUTCFullYear();
var CDate = mdate+"-"+mmonth+"-"+myear;
//console.log(CDate)
var IsActive = '';
if(myModel.IsActive == true)
@ -190,6 +199,8 @@ else if(myModel.IsActive == false)
});
}
};

8
Apollo/assets/js/controllers/generateHallTicketCtrl.js
View File

@ -638,28 +638,28 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
switch(i)
{
case 0:
var firstTableID = tableid+'year10';
var firstTableID = tableid+'year1'+key;
//var SecTableID = tableid+'year11';
semName = 'YEAR1';
break;
case 1:
var firstTableID = tableid+'year20';
var firstTableID = tableid+'year2'+key;
//var SecTableID = tableid+'year21';
semName = 'YEAR2';
break;
case 2:
var firstTableID = tableid+'year30';
var firstTableID = tableid+'year3'+key;
//var SecTableID = tableid+'year31';
semName = 'YEAR3';
break;
case 4:
var firstTableID = tableid+'year40';
var firstTableID = tableid+'year4'+key;
//var SecTableID = tableid+'year41';
semName = 'YEAR4';

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

@ -150,7 +150,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as ApplicationPendingStatus INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as InititalPaymentDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as ApplicationPendingStatus,formtype as FormType,appdate as Date INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
};

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

@ -173,10 +173,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}
//Export to excel
var mystyle = {
sheetid: 'BALANCE FEE STATUS REPORT',
sheetid: 'FEE BALANCE REPORT',
headers: true,
caption: {
title:'BALANCE FEE STATUS REPORT',
title:'FEE BALANCE REPORT',
width: '300px',
style:'font-size:50px;'
},

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

@ -150,7 +150,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,adate as DocumentAppliedDate,certname as DocumentName,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,fdate as Followupdate,certname as DocumentName INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]);
};
/*modal controller
* */

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

@ -150,7 +150,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSentDate,ansdate as AnswerBookletSentDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
};
/*modal controller
* */

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

@ -142,7 +142,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as StudyMaterial_Status,CAST(Balance_fee AS NUMBER) as BalanceFee,Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
};

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

@ -69,7 +69,8 @@
</div>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<!-- <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2">
Income/Expense
</label>
@ -78,11 +79,12 @@
<option value="" selected>Select</option>
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div>
</div> -->
</div>
<div>
<div ng-show="loadingsearch" class="center">

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

@ -76,7 +76,7 @@
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
<div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<!-- <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2">
Income/Expense
</label>
@ -85,11 +85,11 @@
<option value="" selected>Select</option>
<option value="I001">EXPENSE</option>
<option value="I002">INCOME</option>
<!-- <option ng-repeat="typeName in incomeExpenseName" ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div>
</div> -->
</div>
<div>
<div ng-show="loadingsearch" class="center">

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

@ -51,7 +51,7 @@
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
<div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<!-- <div class="col-md-3 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
<label for="form-field-select-2">
Income/Expense
</label>
@ -63,7 +63,7 @@
</select>
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div>
</div> -->
</div>
<div>
<div ng-show="loadingsearch" class="center">

2
Apollo/assets/views/edit_daybookentries.html
View File

@ -73,7 +73,7 @@
<div class="col-md-3 form-group" >
<div class="col-md-3 form-group" ng-class="{'has-error':p.Reason.$dirty && p.Reason.$invalid, 'has-success':p.Reason.$valid}">
<label>
Reason to Deactivate <span class="symbol required"></span>
</label>

28
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -71,7 +71,7 @@
<!-- END OF SEMESTER TYPE STUDENTS-->
<!-- FOR YEAR TYPE STUDENTS-->
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<thead>
<tr>
@ -79,8 +79,8 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime}}</td><td >&nbsp;</td>
<tr ng-repeat="sub in studentObj.FeeDetails[0]">
<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime}}</td><td >&nbsp;</td>
</tr>
</tbody>
@ -88,16 +88,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<thead>
<tr>
<th width="5%"><center>Sem/Year</center></th><th width="15%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
<th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-1}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime }}</td><td >&nbsp;</td>
<tr ng-repeat="sub in studentObj.FeeDetails[1]">
<td>0{{sub.SemesterID-1}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime }}</td><td >&nbsp;</td>
</tr>
</tbody>
@ -105,16 +105,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<thead>
<tr>
<th width="5%"><center>Sem/Year</center></th><th width="15%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
<th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-2}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td >&nbsp;</td>
<tr ng-repeat="sub in studentObj.FeeDetails[2]">
<td>0{{sub.SemesterID-2}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}}</td><td >&nbsp;</td>
</tr>
</tbody>
@ -122,7 +122,7 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<thead>
<tr>
@ -130,8 +130,8 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-3}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-4}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime}}</td><td >&nbsp;</td>
<tr ng-repeat="sub in studentObj.FeeDetails[3]">
<td>0{{sub.SemesterID-3}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime }} - {{sub.ToTime}}</td><td >&nbsp;</td>
</tr>
</tbody>

2
Apollo/assets/views/report_answer_booklets.html
View File

@ -119,7 +119,7 @@ td,th {
<td>{{p.Sem_year}}({{p.Sem}})</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.balance}}</td>
<td style="text-align:right;">{{p.balance}}</td>
<td>{{p.issuedate}}</td>
<td>{{p.rcvedate}}</td>
<td>{{p.Status}}</td>

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

@ -102,7 +102,8 @@
<th>Sem/Year</th>
<th>Phone No</th>
<th>University</th>
<th>Application Status</th>
<th>Application Pending Status</th>
<th>Form Type</th>
<th>Date</th>
@ -122,6 +123,7 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.Status}}</td>
<td>{{p.formtype}}</td>
<td>{{p.appdate}}</td>

11
Apollo/assets/views/report_exam_writing_fee.html
View File

@ -89,7 +89,7 @@
<thead>
<tr>
<th colspan="9"></th>
<th colspan="8"></th>
<th>Sum of Exam Writing Fee</th>
<th></th>
</tr>
@ -131,13 +131,12 @@
</tbody>
<tfoot>
<td></td>
<td></td>
<td></td>
<td></td>
<td>Total</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td style="text-align:right;">{{ getstf() }}</td>

2
Apollo/assets/views/report_expense.html
View File

@ -81,7 +81,7 @@
<div class="col-md-4">
<input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
</div>
<button pdf-save-button="getpdf" pdf-name="someone.pdf" class="btn btn-success btn-o">PDF</button>
<button pdf-save-button="getpdf" pdf-name="Expense_Report.pdf" class="btn btn-success btn-o">PDF</button>
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>

2
Apollo/assets/views/report_studymaterialstatus.html
View File

@ -120,7 +120,7 @@
<td>{{p.University}}</td>
<td>{{p.Status}}</td>
<td>{{p.Date}}</td>
<td>{{p.Balance_fee}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
</tr>

2
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
View File

@ -368,7 +368,7 @@
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="mobileNumList.grouptype"
ng-Change="getall_Numbers(mobileNumList.grouptype);" required>
<option value="" disabled selected>Select Group</option>
<option ng-repeat="p in statusInfo" value="{{p.ID}}">{{p.GroupName}}</option>
<option ng-repeat="p in statusInfo" ng-if="p.IsActive" value="{{p.ID}}">{{p.GroupName}}</option>
</select>
</div>
<div class="col-md-6">