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

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

Browse Source
This commit is contained in:
gandhimathi 2018-08-01 19:30:56 +05:30
commit 2513175cc1
12 changed files with 67 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/views/courier/courier/courier.component.html
View File

@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<br> <br>
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsiv">
<thead> <thead>
<tr> <tr>
<th>Courier Name</th> <th>Courier Name</th>
@ -48,7 +48,7 @@
<td>{{cour.status}}</td> <td>{{cour.status}}</td>
<td> <td>
<!--<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |--> <!--<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> |-->
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(cour)"></i> <i class="fa fa-eye line-height-table" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(cour)"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>

6
src/app/views/courier/courier/courier.component.scss
View File

@ -0,0 +1,6 @@
.line-height {
line-height: 0.5;
}
.line-height-table {
line-height: 0.1;
}

18
src/app/views/enrolment/student/student.component.html
View File

@ -5,7 +5,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Student Enrolment</ng-template> <ng-template tabHeading>Student Enrolment</ng-template>
<div class="form-group"> <div class="form-group line-height">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="name"> Select Study Center</label> <label for="name"> Select Study Center</label>
@ -21,7 +21,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Student List</ng-template> <ng-template tabHeading>Student List</ng-template>
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
<i class="fa fa-align-justify"></i> Student Details List <i class="fa fa-align-justify"></i> Student Details List
</div> </div>
@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<br> <br>
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive line-height-table">
<thead> <thead>
<tr> <tr>
<th>Form Id</th> <th>Form Id</th>
@ -110,11 +110,11 @@
<td>{{app.sem}}</td> <td>{{app.sem}}</td>
<td>{{app.batch}}</td> <td>{{app.batch}}</td>
<td> <td>
<span *ngIf="app.status == 1" class="badge badge-success">Active</span> <span *ngIf="app.status == 1" style="line-height: 0.1;">Active</span>
<span *ngIf="app.status == 0" class="badge badge-danger">In-Active</span> <span *ngIf="app.status == 0" style="line-height: 0.1;">In-Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>--> <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
</td> </td>
</tr> </tr>
@ -141,7 +141,7 @@
</div> </div>
<br> <br>
<div *ngIf="!oldReg"> <div *ngIf="!oldReg">
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
Personal Details Personal Details
</div> </div>
@ -225,7 +225,7 @@
<!--<div class="card-footer"> <!--<div class="card-footer">
</div>--> </div>-->
</div> </div>
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
Course Details Course Details
</div> </div>
@ -296,7 +296,7 @@
<tab> <tab>
<ng-template tabHeading>Re-registertion</ng-template> <ng-template tabHeading>Re-registertion</ng-template>
<div> <div>
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
Re-registration Re-registration
</div> </div>

6
src/app/views/enrolment/student/student.component.scss
View File

@ -0,0 +1,6 @@
.line-height {
line-height: 0.5;
}
.line-height-table {
line-height: 0.1;
}

20
src/app/views/masters/fees-master/fees-master.component.html
View File

@ -43,49 +43,45 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>TF</td> <td>Tution Fees</td>
<td>Tution Fees</td> <td>Tution Fees</td>
<td> <td>
<span class="badge badge-success">Active</span> <span class="badge badge-success">Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>SF</td> <td>Semester Fees</td>
<td>Semester Fees</td> <td>Semester Fees</td>
<td> <td>
<span class="badge badge-success">Active</span> <span class="badge badge-success">Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>EF</td> <td>Exam Fees</td>
<td>Exam Fees</td> <td>Exam Fees</td>
<td> <td>
<span class="badge badge-danger">Inactive</span> <span class="badge badge-danger">Inactive</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>MF </td> <td>Mark Sheet Fees </td>
<td>Mark Sheet Fees</td> <td>Mark Sheet Fees</td>
<td> <td>
<span class="badge badge-danger">Inactive</span> <span class="badge badge-danger">Inactive</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i>
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>

18
src/app/views/masters/university-master/university-master.component.html
View File

@ -6,7 +6,7 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading> View University &nbsp;<span class="badge badge-pill badge-success">29</span></ng-template> <ng-template tabHeading> View University &nbsp;</ng-template>
<!--/.row--> <!--/.row-->
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
@ -45,7 +45,7 @@
<span class="badge badge-success">Active</span> <span class="badge badge-success">Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i> <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
@ -57,7 +57,7 @@
<span class="badge badge-success">Active</span> <span class="badge badge-success">Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i> <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
@ -69,7 +69,7 @@
<span class="badge badge-danger">Inactive</span> <span class="badge badge-danger">Inactive</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i> <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
@ -81,7 +81,7 @@
<span class="badge badge-danger">Inactive</span> <span class="badge badge-danger">Inactive</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i> <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
@ -93,7 +93,7 @@
<span class="badge badge-success">Active</span> <span class="badge badge-success">Active</span>
</td> </td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editEmployee()"></i> | <i class="fa fa-edit" tooltip="Edit" (click)="university()"></i> |
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i> <i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(emp)"></i>
</td> </td>
</tr> </tr>
@ -125,10 +125,11 @@
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
<div class="card-body"> <div class="card-body">
<div ng-app="myApp" ng-controller="myCtrl">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-4"> <div class="col-md-4">
<label for="company">University ID<span class="required">&nbsp;*</span></label> <label for="company">University ID<span class="required">&nbsp;*</span></label>
<input type="text" class="form-control" id="company" placeholder="Enter your University ID"> <input type="text" class="form-control" id="university" placeholder="Enter your University ID">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label for="company">University Name<span class="required">&nbsp;*</span></label> <label for="company">University Name<span class="required">&nbsp;*</span></label>
@ -168,13 +169,14 @@
<span class="switch-handle"></span> <span class="switch-handle"></span>
</label> </label>
</div> </div>
</div>
</div> </div>
</div> </div>
<div class="card-footer"> <div class="card-footer">
<div class="form-group row"> <div class="form-group row">
<div class=" col-md-12" align="right"> <div class=" col-md-12" align="right">
<button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button> <button type="button" style="margin-bottom: -14px" class="btn btn-sm btn-success" (click)="universitydetail()"><i class="fa fa-dot-circle-o"></i> Submit</button>
&nbsp; &nbsp;
<button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button> <button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
</div> </div>

3
src/app/views/masters/university-master/university-master.component.ts
View File

@ -14,5 +14,6 @@ export class UniversityMasterComponent implements OnInit {
ngOnInit() { ngOnInit() {
} }
} }

8
src/app/views/status/answer-booklet/answer-booklet.component.html
View File

@ -5,7 +5,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Answer Booklet Status</ng-template> <ng-template tabHeading>Answer Booklet Status</ng-template>
<div class="form-group"> <div class="form-group line-height">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="name"> Select Study Center</label> <label for="name"> Select Study Center</label>
@ -18,7 +18,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
<i class="fa fa-align-justify"></i> Answer Booklet List <i class="fa fa-align-justify"></i> Answer Booklet List
</div> </div>
@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<br> <br>
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive line-height-table">
<thead> <thead>
<tr> <tr>
<th>Form Id</th> <th>Form Id</th>
@ -108,7 +108,7 @@
<td>{{app.status}}</td> <td>{{app.status}}</td>
<td> <td>
<!--<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> --> <!--<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> -->
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i> <i class="fa fa-eye line-height-table" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>

6
src/app/views/status/answer-booklet/answer-booklet.component.scss
View File

@ -4,4 +4,10 @@
} }
.backToList:hover { .backToList:hover {
color: blue; color: blue;
}
.line-height {
line-height: 0.5;
}
.line-height-table {
line-height: 0.1;
} }

8
src/app/views/status/documents/documents.component.html
View File

@ -5,7 +5,7 @@
<tabset> <tabset>
<tab> <tab>
<ng-template tabHeading>Documents Status</ng-template> <ng-template tabHeading>Documents Status</ng-template>
<div class="form-group"> <div class="form-group line-height">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="name"> Select Study Center</label> <label for="name"> Select Study Center</label>
@ -18,7 +18,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="card line-height">
<div class="card-header"> <div class="card-header">
<i class="fa fa-align-justify"></i> Documents Status List <i class="fa fa-align-justify"></i> Documents Status List
</div> </div>
@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<br> <br>
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive line-height-table">
<thead> <thead>
<tr> <tr>
<th>Form Id</th> <th>Form Id</th>
@ -107,7 +107,7 @@
<td>{{app.batch}}</td> <td>{{app.batch}}</td>
<td>{{app.status}}</td> <td>{{app.status}}</td>
<td> <td>
<i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i> <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i>
<!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>--> <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
</td> </td>
</tr> </tr>

6
src/app/views/status/documents/documents.component.scss
View File

@ -4,4 +4,10 @@
} }
.backToList:hover { .backToList:hover {
color: blue; color: blue;
}
.line-height {
line-height: 0.5;
}
.line-height-table {
line-height: 0.1;
} }

8
src/app/views/studymaterial/allocatematerial/allocatematerial.component.html
View File

@ -221,7 +221,7 @@
<tr> <tr>
<td><input type="checkbox" name="name1" />&nbsp;</td> <td><input type="checkbox" name="name1" />&nbsp;</td>
<td>Center A</td> <td>Center A</td>
<td>Batch A</td> <td>1st Sem / 2018</td>
<td>MCA</td> <td>MCA</td>
<td>10</td> <td>10</td>
@ -232,7 +232,7 @@
<tr> <tr>
<td><input type="checkbox" name="name1" />&nbsp;</td> <td><input type="checkbox" name="name1" />&nbsp;</td>
<td>Center B</td> <td>Center B</td>
<td>Batch B</td> <td>2nd Sem / 2018</td>
<td>MBA</td> <td>MBA</td>
<td>15</td> <td>15</td>
<td>15</td> <td>15</td>
@ -242,7 +242,7 @@
<tr> <tr>
<td><input type="checkbox" name="name1" />&nbsp;</td> <td><input type="checkbox" name="name1" />&nbsp;</td>
<td>Center C</td> <td>Center C</td>
<td>Batch C</td> <td>3rd Sem / 2019</td>
<td>BE</td> <td>BE</td>
<td>20</td> <td>20</td>
<td>18</td> <td>18</td>
@ -252,7 +252,7 @@
<tr> <tr>
<td><input type="checkbox" name="name1" />&nbsp;</td> <td><input type="checkbox" name="name1" />&nbsp;</td>
<td>Center D</td> <td>Center D</td>
<td>Batch D</td> <td>4th Sem / 2019</td>
<td>DE</td> <td>DE</td>
<td>34</td> <td>34</td>