diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index b5c8530..8b8bbe0 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.html +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -3,7 +3,7 @@
-
Contribute to Specific Need
+
Contribute to Specific Need
@@ -36,25 +36,23 @@
-
+
- + + +
- - - - - +
- + @@ -72,7 +70,7 @@ - + @@ -83,14 +81,14 @@ - + - + @@ -135,17 +133,17 @@ - + -
Contribute to General Development Fund
+
Contribute to General Development Fund
-
+
diff --git a/ng8-seed/src/app/components/contribute/contribute.component.scss b/ng8-seed/src/app/components/contribute/contribute.component.scss index d98078a..394aaa7 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.scss +++ b/ng8-seed/src/app/components/contribute/contribute.component.scss @@ -1,6 +1,12 @@ .calculated-shipping[_ngcontent-gen-c13]{ padding: 0px !important; } +.sidescroll{ + right: 45px !important; + height: fit-content; + position: fixed; + z-index: 1; +} a { text-decoration: underline; color: #4CAF50; @@ -16,7 +22,7 @@ a { td, th { width: 25%; - text-align: center; + // text-align: center; } table.shop-table { // border-collapse: separate; diff --git a/ng8-seed/src/app/components/contribute/contribute.component.ts b/ng8-seed/src/app/components/contribute/contribute.component.ts index 9f37ba9..115b405 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.ts +++ b/ng8-seed/src/app/components/contribute/contribute.component.ts @@ -4,6 +4,7 @@ import { ApiService } from '../../shared/api.service'; import { FormGroup, FormBuilder, FormControl, Validators, } from '@angular/forms'; import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material'; import { Router } from '@angular/router'; +import { SchoolDetailsService } from 'app/shared/school-details.service'; @@ -58,6 +59,13 @@ export class ContributeComponent implements OnInit { this.initForm(); this.getSchoolReqList(); this.getSchoolReqList2(); + + // this.schInfo.schReqId.subscribe(res=> + // { + // this.schRquId = res; + // // console.log(res); + + // }) // window.localStorage.clear(); } @@ -140,7 +148,7 @@ export class ContributeComponent implements OnInit { } - + getSchoolReqList2() { @@ -186,6 +194,10 @@ export class ContributeComponent implements OnInit { }) // console.log('mat'+this.material_category); } + + reset(){ + this.Contribute.reset(); + } ngAfterViewInit() { // Hack: Scrolls to top of Page after page view initialized @@ -285,6 +297,9 @@ export class ContributeComponent implements OnInit { goToProjectDet(curr_array){ this.router.navigate(['home','project-detail',{schoolreqid:curr_array.school_id}]) } + refresh(): void { + window.location.reload(); +} } diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.html b/ng8-seed/src/app/components/project-detail/project-detail.component.html index 1cbbaa3..1a1c65a 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.html +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.html @@ -104,7 +104,7 @@
- +
@@ -184,7 +184,7 @@
RequirementSchool ImgSchool Img Required Qty {{row.qty}} {{row.qty}} Cost Per Unit (in RS) Cost Per Unit (in Rs) {{row.cost_per_unit === null?0:row.cost_per_unit}} Amount (in RS) Amount (in Rs) {{Total[i]}}
- +
diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.ts b/ng8-seed/src/app/components/project-detail/project-detail.component.ts index c9760e0..f139b2f 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.ts +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.ts @@ -84,7 +84,7 @@ getIndividualSchoolReqData(id){ ngAfterViewInit() { // Hack: Scrolls to top of Page after page view initialized let top = document.getElementById('top'); - console.log("d",top); + // console.log("d",top); if (top !== null) { top.scrollIntoView(); top = null; @@ -95,4 +95,15 @@ getIndividualSchoolReqData(id){ this.sliderimg.goToSlide(index); } + navigate(schReferId) + { + // console.log(schReferId); + let data = {'sch_req_id':schReferId}; + // console.log(88,data); + this.schInfo.updateSchRequ(schReferId); + this.router.navigate(['/contribute']); + } + + + } diff --git a/ng8-seed/src/app/components/project-list/project-list.component.html b/ng8-seed/src/app/components/project-list/project-list.component.html index a7c9b7f..1fb03e0 100644 --- a/ng8-seed/src/app/components/project-list/project-list.component.html +++ b/ng8-seed/src/app/components/project-list/project-list.component.html @@ -18,7 +18,7 @@
-
+
diff --git a/ng8-seed/src/app/components/project-list/project-list.component.ts b/ng8-seed/src/app/components/project-list/project-list.component.ts index 33690d4..a886411 100644 --- a/ng8-seed/src/app/components/project-list/project-list.component.ts +++ b/ng8-seed/src/app/components/project-list/project-list.component.ts @@ -50,7 +50,7 @@ export class ProjectListComponent implements OnInit { getschDetails(schDetails) { - let data = {'school_name':schDetails.school_name,'images':schDetails.images,'district_name':schDetails.district_name,'total_b':schDetails.total_b,'total_g':schDetails.total_g,'total':schDetails.total,'teach_tot':schDetails.teach_tot,'nonteach_tot':schDetails.nonteach_tot,'totstaff':schDetails.totstaff,'total_cost':schDetails.total_cost,'total_recevied':schDetails.total_recevied,'school_id':schDetails.school_id,'block_name':schDetails.block_name,'management':schDetails.management,'category':schDetails.category,'high_class':schDetails.high_class,'low_class':schDetails.low_class,'latitude':schDetails.longitude,'longitude':schDetails.longitude}; + let data = {'school_name':schDetails.school_name,'images':schDetails.images,'district_name':schDetails.district_name,'total_b':schDetails.total_b,'total_g':schDetails.total_g,'total':schDetails.total,'teach_tot':schDetails.teach_tot,'nonteach_tot':schDetails.nonteach_tot,'totstaff':schDetails.totstaff,'total_cost':schDetails.total_cost,'total_recevied':schDetails.total_recevied,'school_id':schDetails.school_id,'block_name':schDetails.block_name,'management':schDetails.management,'category':schDetails.category,'high_class':schDetails.high_class,'low_class':schDetails.low_class,'latitude':schDetails.longitude,'longitude':schDetails.longitude,'school_req_id':schDetails.school_req_id}; this.schInfo.updateDetails(data); this.router.navigate(['/home/project-detail']); diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.html b/ng8-seed/src/app/layouts/admin/admin-layout.component.html index 0eded79..a259922 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.html @@ -4,11 +4,11 @@
-

TN Schools +

-
+ @@ -87,7 +87,7 @@
diff --git a/ng8-seed/src/app/session/login/login-component.html b/ng8-seed/src/app/session/login/login-component.html index 9ffc678..a89cba4 100644 --- a/ng8-seed/src/app/session/login/login-component.html +++ b/ng8-seed/src/app/session/login/login-component.html @@ -1,7 +1,7 @@
-
+