Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollosc
This commit is contained in:
dineshkumarkannan
commit
919425facf
@ -94,7 +94,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label for="formType">Select Course<span class="danger">*</span></label>
|
||||
<label for="formType">Select Course</label>
|
||||
|
||||
<select id="disabledSelect" class="form-control">
|
||||
<option value="0">Please Select Course</option>
|
||||
|
||||
@ -159,6 +159,83 @@
|
||||
</div><!--/.col-->
|
||||
</div>
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading> Document </ng-template>
|
||||
<div class="row">
|
||||
|
||||
<div class="form-group col-sm-3">
|
||||
<label for="statusName">Status Name <span class="symbol required"></span></label>
|
||||
<input type="text" class="form-control" id="statusName" placeholder="Enter status name">
|
||||
</div>
|
||||
<div class="form-group col-sm-4 saveBtn">
|
||||
<button type="button" class="btn btn-sm btn-success"><i class="fa fa-plus-circle"></i> Save</button>
|
||||
<button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<i class="fa fa-align-justify"></i> View Document Status
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-3 ">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
<input type="text" id="input1-group1" name="input1-group1" class="form-control" placeholder="Search">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-3 ">
|
||||
<button type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i> Search</button>
|
||||
</div>
|
||||
|
||||
</div><!--/.row-->
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-xs-12">
|
||||
<table class="table table-bordered table-responsive table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Status Name</th>
|
||||
<th>Type</th>
|
||||
<th>Status</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let document of documentStatus">
|
||||
<td>{{document.statusName}}</td>
|
||||
<td>{{document.type}}</td>
|
||||
<td>
|
||||
<span class="badge badge-success">{{document.status}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<a><i class="fa fa-pencil-square-o"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<ul class="pagination">
|
||||
<li class="page-item"><a class="page-link" href="#">Prev</a></li>
|
||||
<li class="page-item active">
|
||||
<a class="page-link" href="#">1</a>
|
||||
</li>
|
||||
<li class="page-item"><a class="page-link" href="#">2</a></li>
|
||||
<li class="page-item"><a class="page-link" href="#">3</a></li>
|
||||
<li class="page-item"><a class="page-link" href="#">4</a></li>
|
||||
<li class="page-item"><a class="page-link" href="#">Next</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<!--/.col-->
|
||||
</div>
|
||||
<!--/.row-->
|
||||
</div>
|
||||
</div>
|
||||
</div><!--/.col-->
|
||||
</div>
|
||||
</tab>
|
||||
<tab>
|
||||
<ng-template tabHeading> Fees</ng-template>
|
||||
<div class="row">
|
||||
|
||||
@ -8,5 +8,5 @@
|
||||
cursor:pointer;
|
||||
}
|
||||
.saveBtn {
|
||||
padding-top: 28px;
|
||||
padding-top: 29px;
|
||||
}
|
||||
@ -12,6 +12,7 @@ export class StatusMasterComponent implements OnInit {
|
||||
formStatus: any;
|
||||
markCardStatus: any;
|
||||
studyMaterialStatus: any;
|
||||
documentStatus: any;
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
@ -39,6 +40,18 @@ export class StatusMasterComponent implements OnInit {
|
||||
status: 'Active'
|
||||
},
|
||||
]
|
||||
this.documentStatus = [
|
||||
{
|
||||
statusName: 'Sent to SC ',
|
||||
type: 'Document',
|
||||
status: 'Active'
|
||||
},
|
||||
{
|
||||
statusName: 'Received by SC',
|
||||
type: 'Document',
|
||||
status: 'Active'
|
||||
},
|
||||
]
|
||||
this.feesStatus = [
|
||||
{
|
||||
statusName: 'Paid',
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
<!--/.col-->
|
||||
</div>
|
||||
<!--/.row-->
|
||||
</div>
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
<div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
|
||||
@ -4,7 +4,6 @@ import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.c
|
||||
import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component';
|
||||
import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component';
|
||||
import { StudyMaterialComponent } from './study-material/study-material.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
@ -33,6 +32,7 @@ const routes: Routes = [
|
||||
title: 'Studymaterialstock'
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
path: 'studyMaterialStatus',
|
||||
component: StudyMaterialComponent,
|
||||
|
||||
@ -12,6 +12,7 @@ import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.c
|
||||
import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component';
|
||||
import { StudyMaterialComponent } from './study-material/study-material.component';
|
||||
import { StudymaterialstockComponent } from './studymaterialstock/studymaterialstock.component';
|
||||
import { ViewstockComponent}from './studymaterialstock/viewstock/viewstock.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
@ -24,6 +25,6 @@ import { StudymaterialstockComponent } from './studymaterialstock/studymaterials
|
||||
],
|
||||
declarations: [ReceivedmaterialComponent, AllocatematerialComponent,
|
||||
StudyMaterialComponent,
|
||||
StudymaterialstockComponent]
|
||||
StudymaterialstockComponent,ViewstockComponent]
|
||||
})
|
||||
export class StudymaterialModule { }
|
||||
|
||||
@ -76,48 +76,30 @@
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Anna University</td>
|
||||
<td>MCA</td>
|
||||
<td>1st Sem</td>
|
||||
<td>10</td>
|
||||
<td>10</td>
|
||||
<tbody *ngFor="let stock of studymaterialDetails; let i = index">
|
||||
<tr>
|
||||
<td>{{stock.universityname}}</td>
|
||||
<td>{{stock.coursename}}</td>
|
||||
<td>{{stock.semyear}}</td>
|
||||
<td>{{stock.registration}}</td>
|
||||
<td>{{stock.stock}}</td>
|
||||
<td>
|
||||
<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" (click)="viewstock(i); showDetails = true"></i>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Bharathi University</td>
|
||||
<td>MBA</td>
|
||||
<td>2nd Sem</td>
|
||||
<td>15</td>
|
||||
<td>15</td>
|
||||
<td>
|
||||
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Thiruvalluvar University</td>
|
||||
<td>BE</td>
|
||||
<td>3rd Sem</td>
|
||||
<td>20</td>
|
||||
<td>20</td>
|
||||
<td>
|
||||
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Kamaraj University</td>
|
||||
<td>DE</td>
|
||||
<td>4th sem</td>
|
||||
<td>34</td>
|
||||
<td>34</td>
|
||||
<td>
|
||||
<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr *ngIf="showDetails && viewId === i" style="background-color:lightblue">
|
||||
|
||||
<td><strong>Date</strong></td>
|
||||
<td><strong>Details</strong></td>
|
||||
<td><strong>Incoming</strong></td>
|
||||
<td><strong>Outgoing</strong></td>
|
||||
<td><strong>Balance on Hand</strong></td>
|
||||
<button (click)="showDetails = false" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i>cancel</button>
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { StudymaterialstockComponent } from './studymaterialstock.component';
|
||||
|
||||
describe('StudymaterialstockComponent', () => {
|
||||
let component: StudymaterialstockComponent;
|
||||
let fixture: ComponentFixture<StudymaterialstockComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ StudymaterialstockComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(StudymaterialstockComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -6,10 +6,67 @@ import { Component, OnInit } from '@angular/core';
|
||||
styleUrls: ['./studymaterialstock.component.scss']
|
||||
})
|
||||
export class StudymaterialstockComponent implements OnInit {
|
||||
|
||||
show = false;
|
||||
closed = false;
|
||||
public myModal;
|
||||
public myModalData;
|
||||
studymaterialDetails: any;
|
||||
stockdetails:any;
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
this.studymaterialDetails = [
|
||||
{
|
||||
universityname: 'Anna University',
|
||||
coursename: 'MCA',
|
||||
semyear: '1st sem/2018',
|
||||
registration: '30',
|
||||
stock: '100'
|
||||
},
|
||||
{
|
||||
universityname: 'Bharathi University',
|
||||
coursename: 'MBA',
|
||||
semyear: '2nd sem/2018',
|
||||
registration: '10',
|
||||
stock: '50'
|
||||
},
|
||||
{
|
||||
universityname: 'Kamaraj University',
|
||||
coursename: 'ME',
|
||||
semyear: '3rd sem/2019',
|
||||
registration: '20',
|
||||
stock: '80'
|
||||
}
|
||||
]
|
||||
|
||||
this.stockdetails = [
|
||||
{
|
||||
date: '10/08/2018',
|
||||
details: 'MCA',
|
||||
incoming: '100',
|
||||
outgoing: '30',
|
||||
balanceonhand: '70'
|
||||
},
|
||||
{
|
||||
date: '12/08/2018',
|
||||
details: 'MCA',
|
||||
incoming: '60',
|
||||
outgoing: '30',
|
||||
balanceonhand: '30'
|
||||
},
|
||||
{
|
||||
date: '14/08/2018',
|
||||
details: 'MCA',
|
||||
incoming: '50',
|
||||
outgoing: '0',
|
||||
balanceonhand: '50'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
viewId: any;
|
||||
viewstock(i){
|
||||
this.viewId = i;
|
||||
this.show = !this.show;
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
<p>
|
||||
viewstock works!
|
||||
</p>
|
||||
@ -0,0 +1,15 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-viewstock',
|
||||
templateUrl: './viewstock.component.html',
|
||||
styleUrls: ['./viewstock.component.scss']
|
||||
})
|
||||
export class ViewstockComponent implements OnInit {
|
||||
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user