diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html index 572e21c..a6925d5 100644 --- a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html @@ -30,10 +30,11 @@
- +
@@ -42,24 +43,24 @@
-
+
- + - + - + @@ -79,26 +80,14 @@ - - - - - - + - + + @@ -80,6 +82,7 @@ + @@ -87,6 +90,7 @@ + @@ -94,6 +98,7 @@ + @@ -101,6 +106,7 @@ + @@ -134,6 +140,27 @@
+<<<<<<< HEAD + +
+
+ + +
+ +
+
+ +
@@ -150,9 +177,10 @@
+
- +
- +
- +
- - + +
diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss index e69de29..afeb7c4 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.scss @@ -0,0 +1,4 @@ + +.required{ + color:red; +} diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts index 5ecfdd4..993948d 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts @@ -11,14 +11,13 @@ export class ReceivedmaterialComponent implements OnInit { ngOnInit() { } - save() - { - alert('testing'); - } + ShowHideDiv(chkPassport) { - - var dvPassport = document.getElementById("chkPassport"); - dvPassport.style.display = chkPassport.isTrusted ? "block" : "none"; + alert('hai'); + var dvPassport = document.getElementById("dvPassport"); + dvPassport.style.display = chkPassport.checked ? "block" : "none"; } - + + } + \ No newline at end of file
Fees Name Fees AmountOne Time / Per SemFees Type Action
Tution FeesAdmission Fees 15000 - One Time + New Registration @@ -67,7 +68,7 @@
Exam FeesTution Fees 5000
Late Fees - 2000 - - Per Sem - - - -
Other Fees 1000 - Per Sem + Re-registration diff --git a/src/app/views/masters/course-master/course-master.component.html b/src/app/views/masters/course-master/course-master.component.html index d93442f..faf8082 100644 --- a/src/app/views/masters/course-master/course-master.component.html +++ b/src/app/views/masters/course-master/course-master.component.html @@ -224,28 +224,28 @@
-
+
- + - + - + - + @@ -254,23 +254,16 @@ - - - - - + + diff --git a/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html index 139ee27..afeb917 100644 --- a/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html +++ b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html @@ -18,7 +18,7 @@
- +
+
+ + +
@@ -173,7 +177,7 @@ 75000
- - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - +
Fees Name Fees AmountOne Time / Per SemFees Type
Tution FeesAdmission Fees 15000 - One Time + New Registration
Exam FeesTution Fees 5000
Late Fees - 2000 - - Per Sem -
Other Fees 1000 - Per Sem + Re-registration
- 25000 + 20000 Partially Paid diff --git a/src/app/views/payment-details/fees-details/fees-details.component.html b/src/app/views/payment-details/fees-details/fees-details.component.html index 5d9eb2b..2ef2c66 100644 --- a/src/app/views/payment-details/fees-details/fees-details.component.html +++ b/src/app/views/payment-details/fees-details/fees-details.component.html @@ -145,7 +145,7 @@
- +
+
+ + +
@@ -307,7 +311,7 @@ 75000
- 25000 + 20000 Partially Paid diff --git a/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html index 1c8fc5d..ebd0f99 100644 --- a/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html +++ b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html @@ -22,13 +22,13 @@
- +
- +
Center A1st Sem / 2018MCA10
{{app.studycentername}}{{app.sem}}{{app.course}}{{app.Quantity}} sent
Center B2nd Sem / 2018MBA15 - Received -
Center C3rd Sem / 2019BE20 - Received -
Center D4th Sem / 2019DE34 - Received -
@@ -135,7 +107,76 @@
+
+ + + + Allocate Study Materials
@@ -285,4 +326,5 @@
-
\ No newline at end of file + + \ No newline at end of file diff --git a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts index b27d3ad..3c425c0 100644 --- a/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts +++ b/src/app/views/studymaterial/allocatematerial/allocatematerial.component.ts @@ -7,9 +7,43 @@ import { Component, OnInit } from '@angular/core'; }) export class AllocatematerialComponent implements OnInit { - constructor() { } + show = false; + closed = false; + public myModal; + public myModalData; + studyMaterialDetails: any; + constructor() { } + ngOnInit(){ + this.studyMaterialDetails = [ + { + studycentername: 'Studycenter A', + sem:'1st Sem/2018', + course: 'BE', + Quantity: '30', + + }, + { + studycentername: 'Studycenter B', + sem:'2nd Sem/2018', + course: 'MCA', + Quantity: '10', + }, + { + studycentername: 'Studycenter C', + sem:'1st Sem/2018', + course: 'MBA', + Quantity: '20', + } + ] + } + - ngOnInit() { + getModelWindowDetails(stuCent) { + this.myModalData = stuCent||null; + } + editStudyCenter(){ + this.show = !this.show; } } + \ No newline at end of file diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html index 2e88169..63a6ced 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html @@ -10,6 +10,7 @@
+
@@ -70,7 +71,8 @@
University Name Course Name Sem/YearQuantityReceived QuantityBalance Quantity Received Date
MCA 1st Sem 100 10/10/2018
MBA 2nd Sem 152 15/10/2018
BE 3rd Sem 200 10/11/2018
DE 4th sem 3410 12/11/2018