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:
gayathri1990 2018-08-10 14:59:46 +05:30
commit db173f79c2
4 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@
<i class="fa fa-align-justify"></i> Add Courier Details <i class="fa fa-align-justify"></i> Add Courier Details
</div> </div>
<form> <form>
<div class="card-body">
<fieldset> <fieldset>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -147,6 +148,7 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
</div>
<div class="card-footer" align="right"> <div class="card-footer" align="right">
<button type="submit" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button> <button type="submit" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button> <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>

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

@ -440,7 +440,7 @@
</div> </div>
<div class="container"> <div class="container">
<div align="right"> <div align="right">
<button type="submit" class="btn btn-sm btn-success" (click)="otherRegModal.show(); getOtherRegModelWindowDetails(app)"> Add Other Registration</button> <button type="submit" class="btn btn-sm btn-success" (click)="otherRegModal.show();"> Add Other Registration</button>
<!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>--> <!--<button type="reset" class="btn btn-sm btn-danger"> Reset</button>-->
</div> </div>
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive">

1
src/app/views/enrolment/student/student.component.ts
View File

@ -102,7 +102,6 @@ export class StudentComponent implements OnInit {
} }
// open student fees modal // open student fees modal
getFeesModelWindowDetails(details) { getFeesModelWindowDetails(details) {
console.log(details)
this.feesModalData = details.feesDetails||null; this.feesModalData = details.feesDetails||null;
} }
} }

6
src/app/views/masters/form-list/form-list.component.html
View File

@ -21,8 +21,8 @@
<table class="table table-bordered table-responsive"> <table class="table table-bordered table-responsive">
<thead> <thead>
<tr> <tr>
<th>From Name</th> <th>Form Name</th>
<th>From Type</th> <th>Form Type</th>
<th>Course / University</th> <th>Course / University</th>
<th>Description</th> <th>Description</th>
<th>Status</th> <th>Status</th>
@ -74,7 +74,7 @@
<input type="text" class="form-control" id="formName" placeholder="Enter Form Name"> <input type="text" class="form-control" id="formName" placeholder="Enter Form Name">
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="formType">From Type <span class="danger">*</span></label> <label for="formType">Form Type <span class="danger">*</span></label>
<select class="form-control" id="formType" placeholder="Select Form Type"> <select class="form-control" id="formType" placeholder="Select Form Type">
<option disabled>Select Form Type</option> <option disabled>Select Form Type</option>
<option>Admission Form</option> <option>Admission Form</option>