From 915b558467470a59229c315d10056f4384b63017 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Mon, 30 Jul 2018 18:51:24 +0530 Subject: [PATCH 1/2] code integration by Bala --- .../batch-master/batch-master.component.html | 261 +++++++++++++++ .../batch-master/batch-master.component.scss | 54 ++++ .../batch-master/batch-master.component.ts | 18 ++ .../document-master.component.html | 159 +++++++++ .../document-master.component.scss | 4 + .../document-master.component.ts | 15 + .../examtime-table.component.html | 193 +++++++++++ .../examtime-table.component.scss | 30 ++ .../examtime-table.component.spec.ts | 25 ++ .../examtime-table.component.ts | 18 ++ .../fees-master/fees-master.component.html | 152 +++++++++ .../fees-master/fees-master.component.scss | 4 + .../fees-master/fees-master.component.ts | 15 + .../form-master/form-master.component.html | 155 +++++++++ .../form-master/form-master.component.scss | 4 + .../form-master/form-master.component.ts | 15 + .../study-material.component.html | 305 ++++++++++++++++++ .../study-material.component.scss | 4 + .../study-material.component.ts | 15 + .../university-master.component.html | 182 +++++++++++ .../university-master.component.scss | 4 + .../university-master.component.ts | 18 ++ .../paymentdetails.component.html | 134 ++++++++ .../paymentdetails.component.scss | 0 .../paymentdetails.component.ts | 15 + .../allocatematerial.component.html | 164 ++++++++++ .../allocatematerial.component.scss | 0 .../allocatematerial.component.ts | 15 + .../receivedmaterial.component.html | 156 +++++++++ .../receivedmaterial.component.scss | 0 .../receivedmaterial.component.ts | 15 + .../studymaterial-routing.module.ts | 34 ++ .../studymaterial/studymaterial.module.ts | 25 ++ 33 files changed, 2208 insertions(+) create mode 100644 src/app/views/masters/batch-master/batch-master.component.html create mode 100644 src/app/views/masters/batch-master/batch-master.component.scss create mode 100644 src/app/views/masters/batch-master/batch-master.component.ts create mode 100644 src/app/views/masters/document-master/document-master.component.html create mode 100644 src/app/views/masters/document-master/document-master.component.scss create mode 100644 src/app/views/masters/document-master/document-master.component.ts create mode 100644 src/app/views/masters/examtime-table/examtime-table.component.html create mode 100644 src/app/views/masters/examtime-table/examtime-table.component.scss create mode 100644 src/app/views/masters/examtime-table/examtime-table.component.spec.ts create mode 100644 src/app/views/masters/examtime-table/examtime-table.component.ts create mode 100644 src/app/views/masters/fees-master/fees-master.component.html create mode 100644 src/app/views/masters/fees-master/fees-master.component.scss create mode 100644 src/app/views/masters/fees-master/fees-master.component.ts create mode 100644 src/app/views/masters/form-master/form-master.component.html create mode 100644 src/app/views/masters/form-master/form-master.component.scss create mode 100644 src/app/views/masters/form-master/form-master.component.ts create mode 100644 src/app/views/masters/study-material/study-material.component.html create mode 100644 src/app/views/masters/study-material/study-material.component.scss create mode 100644 src/app/views/masters/study-material/study-material.component.ts create mode 100644 src/app/views/masters/university-master/university-master.component.html create mode 100644 src/app/views/masters/university-master/university-master.component.scss create mode 100644 src/app/views/masters/university-master/university-master.component.ts create mode 100644 src/app/views/status/paymentdetails/paymentdetails.component.html create mode 100644 src/app/views/status/paymentdetails/paymentdetails.component.scss create mode 100644 src/app/views/status/paymentdetails/paymentdetails.component.ts create mode 100644 src/app/views/studymaterial/allocatematerial/allocatematerial.component.html create mode 100644 src/app/views/studymaterial/allocatematerial/allocatematerial.component.scss create mode 100644 src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts create mode 100644 src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html create mode 100644 src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss create mode 100644 src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts create mode 100644 src/app/views/studymaterial/studymaterial-routing.module.ts create mode 100644 src/app/views/studymaterial/studymaterial.module.ts diff --git a/src/app/views/masters/batch-master/batch-master.component.html b/src/app/views/masters/batch-master/batch-master.component.html new file mode 100644 index 0000000..d552f67 --- /dev/null +++ b/src/app/views/masters/batch-master/batch-master.component.html @@ -0,0 +1,261 @@ + + + Back to List + + +
+ + +
+ +
+ + + + View Batch  13 + + +
+
+
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Batch CodeBatch NameBatch DateUniversity NameStatusIsDefaultAction
B001A1112/12/2018Karnataka university + Active + + + + | + +
B002B1112/12/2018Anna university + Active + + + + | + +
B003C1112/12/2018Bharathi University + Inactive + + + + | + +
B004D1112/12/2018Tamilnadu university + Inactive + + + + | + +
B005E2312/12/2018Thiruvalluvar university + Active + + + + | + +
+ +
+ +
+ + + + Add Batch +
+
+ Batch +
+ +
+
+
+
+ + +
+
+ + +
+ +
+ +
+
+ +
+
+ + + +
+ +
+
+
+ +
+
+
+ + +   + +
+
+
+ +
+
+ + + +
+
+
+ + + + + + + diff --git a/src/app/views/masters/batch-master/batch-master.component.scss b/src/app/views/masters/batch-master/batch-master.component.scss new file mode 100644 index 0000000..6f89d88 --- /dev/null +++ b/src/app/views/masters/batch-master/batch-master.component.scss @@ -0,0 +1,54 @@ + +.required{ + color:red; +} +* {box-sizing: border-box;} + + +.topnav { + overflow: hidden; + background-color: #e9e9e9; +} + +.topnav a { + float: left; + display: block; + color: black; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} + +.topnav a:hover { + background-color: #ddd; + color: black; +} + +.topnav a.active { + background-color: #2196F3; + color: white; +} + +.topnav input[type=text] { + float: right; + padding: 6px; + margin-top: 8px; + margin-right: 16px; + border: none; + font-size: 17px; +} + +@media screen and (max-width: 600px) { + .topnav a, .topnav input[type=text] { + float: none; + display: block; + text-align: left; + width: 100%; + margin: 0; + padding: 14px; + } + .topnav input[type=text] { + border: 1px solid #ccc; + } +} diff --git a/src/app/views/masters/batch-master/batch-master.component.ts b/src/app/views/masters/batch-master/batch-master.component.ts new file mode 100644 index 0000000..beab99a --- /dev/null +++ b/src/app/views/masters/batch-master/batch-master.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-batch-master', + templateUrl: './batch-master.component.html', + styleUrls: ['./batch-master.component.scss'] +}) +export class BatchMasterComponent implements OnInit { + university = ["Select University","Anna University", "Thiruvalluvar University", "Bharathidasan University"]; + + +ngOnInit(){ + + } + + + +} diff --git a/src/app/views/masters/document-master/document-master.component.html b/src/app/views/masters/document-master/document-master.component.html new file mode 100644 index 0000000..0d59cf1 --- /dev/null +++ b/src/app/views/masters/document-master/document-master.component.html @@ -0,0 +1,159 @@ + + + Back to List + + +
+ + +
+ +
+ + + + View Document  13 + +
+
+
+ + + + +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Document NameDocument DescriptionDocument DateAction
SFSemester Fess Document12/12/2018 + + + | + +
MFMarksheet Document12/12/2018 + | + +
EFExam Fees12/12/2018 + | + +
HTHall Ticket12/12/2018 + | + +
+ +
+ +
+ + + + Add Document +
+
+ Document +
+ +
+
+
+
+ + +
+
+ + +
+ + + +
+ +
+ +
+ + + +
+
+
+
+
+
+
+ + +   + +
+
+
+
+ +
+ + +
+
+
+ + + + diff --git a/src/app/views/masters/document-master/document-master.component.scss b/src/app/views/masters/document-master/document-master.component.scss new file mode 100644 index 0000000..afeb7c4 --- /dev/null +++ b/src/app/views/masters/document-master/document-master.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/masters/document-master/document-master.component.ts b/src/app/views/masters/document-master/document-master.component.ts new file mode 100644 index 0000000..a8597ba --- /dev/null +++ b/src/app/views/masters/document-master/document-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-document-master', + templateUrl: './document-master.component.html', + styleUrls: ['./document-master.component.scss'] +}) +export class DocumentMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/examtime-table/examtime-table.component.html b/src/app/views/masters/examtime-table/examtime-table.component.html new file mode 100644 index 0000000..cd762a2 --- /dev/null +++ b/src/app/views/masters/examtime-table/examtime-table.component.html @@ -0,0 +1,193 @@ + + + Back to List + + +
+ + +
+ +
+ + + + Exam TimeTable  13 + +
+
+
+ + + + +
+
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
University NameBatch NameCourseSubject NameDateFrom TimeTo TimeAction
DMSBatch BMCAData Structure10/01/20181.00 PM4.00 PM + + | + +
AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PM + | + +
AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PM + | + +
AUTBatch AMBABusiness Logic12/12/201810.00 AM1.00 PM + | + +
+ +
+ +
+ + + + Add ExamTimetable +
+
+ ExamTable +
+ +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+
+ +
+ +
+ + + +
+
+
+
+
+
+
+ + +   + +
+
+
+
+ +
+ + +
+
+
+ + + + diff --git a/src/app/views/masters/examtime-table/examtime-table.component.scss b/src/app/views/masters/examtime-table/examtime-table.component.scss new file mode 100644 index 0000000..d1e861b --- /dev/null +++ b/src/app/views/masters/examtime-table/examtime-table.component.scss @@ -0,0 +1,30 @@ +p.example input[type=text] { + padding: 10px; + font-size: 13px; + border: 1px solid grey; + float: left; + width: 60%; + background: #f1f1f1; +} + +p.example button { + float: left; + width: 20%; + padding: 10px; + background: #2196F3; + color: white; + font-size: 13px; + border: 1px solid grey; + border-left: none; + cursor: pointer; +} + +p.example button:hover { + background: #0b7dda; +} + +p.example::after { + content: ""; + clear: both; + display: table; +} \ No newline at end of file diff --git a/src/app/views/masters/examtime-table/examtime-table.component.spec.ts b/src/app/views/masters/examtime-table/examtime-table.component.spec.ts new file mode 100644 index 0000000..676ef6b --- /dev/null +++ b/src/app/views/masters/examtime-table/examtime-table.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExamtimeTableComponent } from './examtime-table.component'; + +describe('ExamtimeTableComponent', () => { + let component: ExamtimeTableComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExamtimeTableComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExamtimeTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/masters/examtime-table/examtime-table.component.ts b/src/app/views/masters/examtime-table/examtime-table.component.ts new file mode 100644 index 0000000..2e30e90 --- /dev/null +++ b/src/app/views/masters/examtime-table/examtime-table.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-examtime-table', + templateUrl: './examtime-table.component.html', + styleUrls: ['./examtime-table.component.scss'] +}) +export class ExamtimeTableComponent implements OnInit { + university = ["Select University","Anna University", "Thiruvalluvar University", "Bharathidasan University"]; + batch = ["Select Batch","Batch A","Batch B", "Batch C", "Batch D"]; + course = ["Select Course","MBA","MCA", "ME", "BE"]; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/fees-master/fees-master.component.html b/src/app/views/masters/fees-master/fees-master.component.html new file mode 100644 index 0000000..8bfbca6 --- /dev/null +++ b/src/app/views/masters/fees-master/fees-master.component.html @@ -0,0 +1,152 @@ + + + Back to List + + +
+ + +
+ +
+ + + + View Fees  13 + +
+
+
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FeesNameDescriptionStatusAction
TFTution Fees + Active + + | + +
SFSemester Fees + Active + + | + +
EFExam Fees + Inactive + + | + +
MF Mark Sheet Fees + Inactive + + | + +
+ +
+ +
+ + + + Add Fees +
+
+ Fees +
+ +
+
+
+ +
+ + +
+
+ + +
+
+
+
+
+
+
+ + +   + +
+
+
+
+ +
+ + + +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/app/views/masters/fees-master/fees-master.component.scss b/src/app/views/masters/fees-master/fees-master.component.scss new file mode 100644 index 0000000..afeb7c4 --- /dev/null +++ b/src/app/views/masters/fees-master/fees-master.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/masters/fees-master/fees-master.component.ts b/src/app/views/masters/fees-master/fees-master.component.ts new file mode 100644 index 0000000..c2910d2 --- /dev/null +++ b/src/app/views/masters/fees-master/fees-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-fees-master', + templateUrl: './fees-master.component.html', + styleUrls: ['./fees-master.component.scss'] +}) +export class FeesMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/form-master/form-master.component.html b/src/app/views/masters/form-master/form-master.component.html new file mode 100644 index 0000000..75d7c97 --- /dev/null +++ b/src/app/views/masters/form-master/form-master.component.html @@ -0,0 +1,155 @@ + + + Back to List + + +
+ + +
+ +
+ + + + View Fees  13 + +
+
+
+ + + + +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormNameDescriptionStatusAction
TCTransfer certificate + Active + + | + +
PCProvisional Certificate + Active + + | + +
DCDegree Certificate + Inactive + + | + +
MSMark Sheet + Inactive + + | + +
+ +
+ +
+ + + + Add Form +
+
+ Form +
+ +
+
+
+ +
+ + +
+
+ + +
+
+
+
+
+
+
+ + +   + +
+
+
+
+ +
+ + + +
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/src/app/views/masters/form-master/form-master.component.scss b/src/app/views/masters/form-master/form-master.component.scss new file mode 100644 index 0000000..afeb7c4 --- /dev/null +++ b/src/app/views/masters/form-master/form-master.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/masters/form-master/form-master.component.ts b/src/app/views/masters/form-master/form-master.component.ts new file mode 100644 index 0000000..2e80640 --- /dev/null +++ b/src/app/views/masters/form-master/form-master.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-form-master', + templateUrl: './form-master.component.html', + styleUrls: ['./form-master.component.scss'] +}) +export class FormMasterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/study-material/study-material.component.html b/src/app/views/masters/study-material/study-material.component.html new file mode 100644 index 0000000..587361f --- /dev/null +++ b/src/app/views/masters/study-material/study-material.component.html @@ -0,0 +1,305 @@ +
+ +
+ +
+ + + + Received Study Materials +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+ +
+
+
+ + +
+
+
+
+ + View Received Study Materials  29 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Study Center NameCourse NameCourier NoQuantityDispatch Date
Center AMCA1A1010/10/2018
Center BMBA1B1515/10/2018
Center CBE1C2010/11/2018
Center DDE1D3412/11/2018
+ +
+ +
+ + + + + Add Allocate Of Study Materials +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+ +
+
+
+ + +
+
+
+
+ + View Allocation of Study Materials  29 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Study Center NameCourse NameCourier NoQuantityDispatch Date
Center AMCA1A1010/10/2018
Center BMBA1B1515/10/2018
Center CBE1C2010/11/2018
Center DDE1D3412/11/2018
+ +
+ +
+ + + +
+
+ +
\ No newline at end of file diff --git a/src/app/views/masters/study-material/study-material.component.scss b/src/app/views/masters/study-material/study-material.component.scss new file mode 100644 index 0000000..afeb7c4 --- /dev/null +++ b/src/app/views/masters/study-material/study-material.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/masters/study-material/study-material.component.ts b/src/app/views/masters/study-material/study-material.component.ts new file mode 100644 index 0000000..fb95a26 --- /dev/null +++ b/src/app/views/masters/study-material/study-material.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-study-material', + templateUrl: './study-material.component.html', + styleUrls: ['./study-material.component.scss'] +}) +export class StudyMaterialComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/masters/university-master/university-master.component.html b/src/app/views/masters/university-master/university-master.component.html new file mode 100644 index 0000000..56a5c48 --- /dev/null +++ b/src/app/views/masters/university-master/university-master.component.html @@ -0,0 +1,182 @@ +
+ +
+ +
+ + + + View University  29 + +
+
+
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
University IDUniversity NameEmail IDStatusActivity
KSOUKarnataka universityks@uni.com + Active + + | + +
AUTAnna universityau@uni.com + Active + + | + +
BUTBharathi Universitybu@uni.com + Inactive + + | + +
TUTTamilnadu universityta@uni.com + Inactive + + | + +
THUTThiruvalluvar universitythu@uni.com + Active + + | + +
+ +
+ +
+ + + + Add University +
+
+ University +
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+
+ + +   + +
+
+
+
+ +
+ +
+
+ +
\ No newline at end of file diff --git a/src/app/views/masters/university-master/university-master.component.scss b/src/app/views/masters/university-master/university-master.component.scss new file mode 100644 index 0000000..afeb7c4 --- /dev/null +++ b/src/app/views/masters/university-master/university-master.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/masters/university-master/university-master.component.ts b/src/app/views/masters/university-master/university-master.component.ts new file mode 100644 index 0000000..1700a37 --- /dev/null +++ b/src/app/views/masters/university-master/university-master.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalDirective } from 'ngx-bootstrap/modal'; + +@Component({ + selector: 'app-university-master', + templateUrl: './university-master.component.html', + styleUrls: ['./university-master.component.scss'] +}) +export class UniversityMasterComponent implements OnInit { + + + constructor() { } + + ngOnInit() { + + } + +} diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.html b/src/app/views/status/paymentdetails/paymentdetails.component.html new file mode 100644 index 0000000..e0dd1cd --- /dev/null +++ b/src/app/views/status/paymentdetails/paymentdetails.component.html @@ -0,0 +1,134 @@ + + + Back to List + + +
+ + +
+ +
+ + + + + + + +
+
+ PaymentDetails +
+
+ + +
+
+
+
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateDescriptionDebitCreditBalance
10/08/2018FormID 1010,00010,000
11/08/2018FormID 2015,00025,000
12/08/2018FormID 35000020,000
16/08/2018FormID 410,000010,000
+ +
+ +
+
+
+
+
+
+ + +   + +
+
+
+ + +
+ +
+
+
+ + + + diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.scss b/src/app/views/status/paymentdetails/paymentdetails.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.ts b/src/app/views/status/paymentdetails/paymentdetails.component.ts new file mode 100644 index 0000000..567a639 --- /dev/null +++ b/src/app/views/status/paymentdetails/paymentdetails.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-paymentdetails', + templateUrl: './paymentdetails.component.html', + styleUrls: ['./paymentdetails.component.scss'] +}) +export class PaymentdetailsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html new file mode 100644 index 0000000..f0a16f6 --- /dev/null +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.html @@ -0,0 +1,164 @@ +
+
+ + + View Allocation of Study Materials  29 + +
+
+
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Study Center NameBatch NameCourse NameQuantityDispatch Date
Center ABatch AMCA1010/10/2018
Center BBatch BMBA1515/10/2018
Center CBatch CBE2010/11/2018
Center DBatch DDE3412/11/2018
+ +
+ +
+ + + + Allocate Study Materials +
+
+ Study Material +
+
+ +
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+ +
+ +
+ +
+ + + +
+
+ +
+ + +
+ +
+
+
+
+ + +
+
+
+ +
+ +
+ + + +
+
\ No newline at end of file diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.scss b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts new file mode 100644 index 0000000..b27d3ad --- /dev/null +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-allocatematerial', + templateUrl: './allocatematerial.component.html', + styleUrls: ['./allocatematerial.component.scss'] +}) +export class AllocatematerialComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html new file mode 100644 index 0000000..32aa9fb --- /dev/null +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html @@ -0,0 +1,156 @@ +
+
+ + + View Received Study Materials  29 +
+
+
+ + + + +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
University NameCourse NameCourier NoQuantityReceived Date
Anna UniversityMCA1A1010/10/2018
Bharathi UniversityMBA1B1515/10/2018
Thiruvalluvar UniversityBE1C2010/11/2018
Kamaraj UniversityDE1D3412/11/2018
+ +
+ +
+ + + + Received Study Materials +
+
+ Study Material +
+
+
+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+ + +
+ + +
+ +
+ +
+
+ +
+
+
+ +
+ + +
+
+ +
+
+
+
+ + +
+
+
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts new file mode 100644 index 0000000..d5e10d0 --- /dev/null +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-receivedmaterial', + templateUrl: './receivedmaterial.component.html', + styleUrls: ['./receivedmaterial.component.scss'] +}) +export class ReceivedmaterialComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/views/studymaterial/studymaterial-routing.module.ts b/src/app/views/studymaterial/studymaterial-routing.module.ts new file mode 100644 index 0000000..53f7fe8 --- /dev/null +++ b/src/app/views/studymaterial/studymaterial-routing.module.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; +import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; + +const routes: Routes = [ +{ + path: '', + data: { + title: 'Studymaterial' + }, + children: [ + { + path: 'receivedmaterial', + component: ReceivedmaterialComponent, + data: { + title: 'ReceivedMaterial' + } + }, + { + path: 'allocatematerial', + component: AllocatematerialComponent, + data: { + title: 'AllocateMaterial' + } + } + ] + }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class StudymaterialRoutingModule { } diff --git a/src/app/views/studymaterial/studymaterial.module.ts b/src/app/views/studymaterial/studymaterial.module.ts new file mode 100644 index 0000000..6db115d --- /dev/null +++ b/src/app/views/studymaterial/studymaterial.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; + + +import { TabsModule } from 'ngx-bootstrap/tabs'; +import { TooltipModule } from 'ngx-bootstrap/tooltip'; +import { ModalModule } from 'ngx-bootstrap/modal'; + +import { StudymaterialRoutingModule } from './studymaterial-routing.module'; +import { ReceivedmaterialComponent } from './receivedmaterial/receivedmaterial.component'; +import { AllocatematerialComponent } from './allocatematerial/allocatematerial.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + TooltipModule, + ModalModule, + TabsModule, + StudymaterialRoutingModule + ], + declarations: [ReceivedmaterialComponent, AllocatematerialComponent] +}) +export class StudymaterialModule { } From 75b830bc459a06b4c26396c81de682044e67cd83 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Mon, 30 Jul 2018 19:12:49 +0530 Subject: [PATCH 2/2] main file changes by bala --- src/app/app.module.ts | 4 +- src/app/app.routing.ts | 4 ++ .../app-sidebar/app-sidebar.component.ts | 51 +++++++++++++++++++ .../views/masters/masters-routing.module.ts | 50 ++++++++++++++++++ src/app/views/masters/masters.module.ts | 22 +++++++- src/app/views/status/status-routing.module.ts | 8 +++ src/app/views/status/status.module.ts | 5 +- 7 files changed, 141 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ad9da14..f4cd3d9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,6 +8,7 @@ import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { StatusModule } from './views/status/status.module'; import { EntrollmentModule } from './views/entrollment/entrollment.module'; +import { StudymaterialModule } from './views/studymaterial/studymaterial.module'; import { AppComponent } from './app.component'; @@ -74,7 +75,8 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; TooltipModule.forRoot(), ChartsModule, StatusModule, - EntrollmentModule + EntrollmentModule, + StudymaterialModule ], declarations: [ AppComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index e023a92..fc5e2b1 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -51,6 +51,10 @@ export const routes: Routes = [ { path: 'entrollment', loadChildren: './views/entrollment/entrollment.module#EntrollmentModule' + }, + { + path: 'studymaterial', + loadChildren: './views/studymaterial/studymaterial.module#StudymaterialModule' } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index a316a3e..2b65cf8 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -54,6 +54,37 @@ export class AppSidebar { name: 'Form List Master', url: '/masters/formList', icon: 'fa fa-language' + }, + { + name: 'University Master', + url: '/masters/UniversityMaster', + icon: 'fa fa-language' + }, + { + name: 'Batch Master', + url: '/masters/BatchMaster', + icon: 'fa fa-language' + }, + { + name: 'Document Master', + url: '/masters/DocumentMaster', + icon: 'fa fa-language' + }, + { + name: 'Fees Master', + url: '/masters/FeesMaster', + icon: 'fa fa-language' + }, + { + name: 'Form Master', + url: '/masters/FormMaster', + icon: 'fa fa-language' + }, + + { + name: 'Exam Timetable', + url: '/masters/ExamTimetable', + icon: 'fa fa-language' } ] },{ @@ -81,6 +112,11 @@ export class AppSidebar { name: 'Documents', url: '/status/documents', icon: 'fa fa-file-pdf-o' + }, + { + name: 'PaymentDetails', + url: '/status/paymentdetails', + icon: 'fa fa-user-secret' } ] },{ @@ -93,6 +129,21 @@ export class AppSidebar { icon: 'fa fa-user' } ] + },{ + name: 'Study Material', + icon: 'fa fa-gear', + children: [ + { + name: 'ReceivedMaterial', + url: '/studymaterial/receivedmaterial', + icon: 'fa fa-user-secret' + }, + { + name: 'AllocateMaterial', + url: '/studymaterial/allocatematerial', + icon: 'fa fa-user-secret' + } + ] } ]; } diff --git a/src/app/views/masters/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts index 0625b5d..35e2d10 100644 --- a/src/app/views/masters/masters-routing.module.ts +++ b/src/app/views/masters/masters-routing.module.ts @@ -5,6 +5,13 @@ import { EmployeeComponent } from './employee/employee.component'; import { RoleComponent } from './role/role.component'; import { StudyCenterComponent } from './study-center/study-center.component'; import { FormListComponent } from './form-list/form-list.component'; +import { UniversityMasterComponent } from './university-master/university-master.component'; +import { BatchMasterComponent } from './batch-master/batch-master.component'; +import { DocumentMasterComponent } from './document-master/document-master.component'; +import { FeesMasterComponent } from './fees-master/fees-master.component'; +import { FormMasterComponent } from './form-master/form-master.component'; +import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; +import { StudyMaterialComponent } from './study-material/study-material.component'; const routes: Routes = [ { path: '', @@ -40,6 +47,49 @@ const routes: Routes = [ title: 'Form List' } } + , + { + path: 'UniversityMaster', + component: UniversityMasterComponent, + data: { + title: 'University Master' + } + }, + { + path: 'BatchMaster', + component: BatchMasterComponent, + data: { + title: 'Batch Master' + } + }, + { + path: 'DocumentMaster', + component: DocumentMasterComponent, + data: { + title: 'Document Master' + } + }, + { + path: 'FeesMaster', + component: FeesMasterComponent, + data: { + title: 'Fees Master' + } + }, + { + path: 'FormMaster', + component: FormMasterComponent, + data: { + title: 'Form Master' + } + }, + { + path: 'ExamTimetable', + component: ExamtimeTableComponent, + data: { + title: 'Exam Timetable' + } + } ] } ]; diff --git a/src/app/views/masters/masters.module.ts b/src/app/views/masters/masters.module.ts index 9e18941..1fcd278 100644 --- a/src/app/views/masters/masters.module.ts +++ b/src/app/views/masters/masters.module.ts @@ -19,6 +19,19 @@ import { EditEmployeeComponent } from './employee/edit-employee/edit-employee.co // Study Center import { StudyCenterComponent } from './study-center/study-center.component'; import { EditStudyCenterComponent } from './study-center/edit-study-center/edit-study-center.component'; +//University +import { UniversityMasterComponent } from './university-master/university-master.component'; +//Batch +import { BatchMasterComponent } from './batch-master/batch-master.component'; +//Document +import { DocumentMasterComponent } from './document-master/document-master.component'; +//Fees +import { FeesMasterComponent } from './fees-master/fees-master.component'; +//Form +import { FormMasterComponent } from './form-master/form-master.component'; +//Study +import { StudyMaterialComponent } from './study-material/study-material.component'; +import { ExamtimeTableComponent } from './examtime-table/examtime-table.component'; // Form list import { FormListComponent } from './form-list/form-list.component'; @@ -38,7 +51,14 @@ import { FormListComponent } from './form-list/form-list.component'; EditEmployeeComponent, StudyCenterComponent, EditStudyCenterComponent, - FormListComponent + FormListComponent, + UniversityMasterComponent, + BatchMasterComponent, + DocumentMasterComponent, + FeesMasterComponent, + FormMasterComponent, + StudyMaterialComponent, + ExamtimeTableComponent ] }) export class MastersModule { } diff --git a/src/app/views/status/status-routing.module.ts b/src/app/views/status/status-routing.module.ts index 6d93c9c..09d2c18 100644 --- a/src/app/views/status/status-routing.module.ts +++ b/src/app/views/status/status-routing.module.ts @@ -6,6 +6,7 @@ import { StudyMaterialComponent } from './study-material/study-material.componen import { DocumentsComponent } from './documents/documents.component'; import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component'; import { CourierComponent } from './courier/courier.component'; +import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; const routes: Routes = [ { @@ -44,6 +45,13 @@ const routes: Routes = [ data: { title: 'Documents' } + } + ,{ + path: 'paymentdetails', + component: PaymentdetailsComponent, + data: { + title: 'Paymentdetails' + } } ] } diff --git a/src/app/views/status/status.module.ts b/src/app/views/status/status.module.ts index cc9c563..1338b38 100644 --- a/src/app/views/status/status.module.ts +++ b/src/app/views/status/status.module.ts @@ -20,6 +20,8 @@ import { AnswerBookletComponent } from './answer-booklet/answer-booklet.componen import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component'; //courier import { CourierComponent } from './courier/courier.component'; +//paymentdetails +import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component'; @NgModule({ imports: [ @@ -37,7 +39,8 @@ import { CourierComponent } from './courier/courier.component'; EditDocumentsComponent, AnswerBookletComponent, EditAnswerBookletComponent, - CourierComponent + CourierComponent, + PaymentdetailsComponent ] }) export class StatusModule { }