diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index e3ca194..b4729fa 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.html +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -1,13 +1,13 @@
-
+
Contribute to Specific Need
- + {{ item.district_name }} @@ -21,6 +21,8 @@ +
+
@@ -35,7 +37,7 @@ -
+
diff --git a/ng8-seed/src/app/components/contribute/contribute.component.ts b/ng8-seed/src/app/components/contribute/contribute.component.ts index 1911085..8195291 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.ts +++ b/ng8-seed/src/app/components/contribute/contribute.component.ts @@ -101,7 +101,7 @@ export class ContributeComponent implements OnInit { { if(res['dataStatus']) { - this.district = res['records']; + this.district = res['records'].filter(val=>val.district_name != null); } }) break; @@ -123,7 +123,7 @@ export class ContributeComponent implements OnInit { { if(res['dataStatus']) { - this.category = res['records']; + this.category = res['records'].filter(val=>val.cat_name != null); } }) break; 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 b4c1590..dc9b189 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 @@ -106,7 +106,7 @@
- +
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 f674467..ed0401c 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 @@ -167,7 +167,19 @@ getIndividualSchoolReqData(id){ }; this.restApi.post(url, data).subscribe(schDet => { if (schDet.dataStatus == true) { - + // schDet.records.filter(val=>{ + // console.log("school det",val) + // val.material_name.sort() + // return val + // }) + schDet.records.sort((a,b)=>{ + console.log("scholl det",a,b) + if(a.material_name < b.material_name) + return -1 + if(a.material_name > b.material_name) + return 1 + return 0 + }) // console.log(schDet); this.dataSource=schDet.records this.dataLength=schDet.records.length 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 a886411..b0d5dab 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 @@ -53,6 +53,6 @@ export class ProjectListComponent implements OnInit { 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']); + this.router.navigate(['/home/project-detail',{schoolreqid:schDetails.school_id}]); } } diff --git a/ng8-seed/src/app/components/register/register-component.html b/ng8-seed/src/app/components/register/register-component.html index 355c111..29979f0 100644 --- a/ng8-seed/src/app/components/register/register-component.html +++ b/ng8-seed/src/app/components/register/register-component.html @@ -62,7 +62,7 @@ - +
diff --git a/ng8-seed/src/app/components/register/register.component.ts b/ng8-seed/src/app/components/register/register.component.ts index 941bcc7..0d337a1 100644 --- a/ng8-seed/src/app/components/register/register.component.ts +++ b/ng8-seed/src/app/components/register/register.component.ts @@ -45,6 +45,7 @@ export class RegisterComponent { // user_dob:new FormControl(''), password: new FormControl(''), confirm_password:new FormControl(''), + user_type:new FormControl('1'), org_info: this.fb.group({ orgname: new FormControl(''), org_address: new FormControl(''), @@ -61,9 +62,11 @@ export class RegisterComponent { console.log(value) if(value.checked == true){ this.slide1=true + this.go_reg.controls['user_type'].setValue('2'); } else{ this.slide1=false + this.go_reg.controls['user_type'].setValue('1'); } } setValidatorConfirmPass(value){ diff --git a/ng8-seed/src/app/components/user-certificate/user-certificate.component.html b/ng8-seed/src/app/components/user-certificate/user-certificate.component.html index 7554d07..213fd2e 100644 --- a/ng8-seed/src/app/components/user-certificate/user-certificate.component.html +++ b/ng8-seed/src/app/components/user-certificate/user-certificate.component.html @@ -17,14 +17,14 @@

CHAMPION OF CHANGE



-
M/S Company Technologies Pvt Ltd
+
{{data.org_name != '' ? 'M/S'+' '+data.org_name : 'Mr/Ms'+' '+data.logged_user_name}}

in acknowledgement of the valuable conribution made towards improvement of government
schools in tamil nadu


School Education Department

Government of Tamil Nadu



-

29-Sep-2019

+

{{data.latest_contribute_date.split(' ')[0]}}

diff --git a/ng8-seed/src/app/components/user-certificate/user-certificate.component.ts b/ng8-seed/src/app/components/user-certificate/user-certificate.component.ts index 982b6c4..75a1a7e 100644 --- a/ng8-seed/src/app/components/user-certificate/user-certificate.component.ts +++ b/ng8-seed/src/app/components/user-certificate/user-certificate.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Inject } from '@angular/core'; import html2canvas from 'html2canvas'; import { ApiService } from 'app/shared/api.service'; import { FormBuilder } from '@angular/forms'; import { Router } from '@angular/router'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { UserProfileComponent } from '../user-profile/user-profile.component'; @Component({ @@ -13,9 +13,10 @@ import { UserProfileComponent } from '../user-profile/user-profile.component'; }) export class UserCertificateComponent implements OnInit { - constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private matDialog:MatDialog,private dialog_ref:MatDialogRef) { } + constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private matDialog:MatDialog,private dialog_ref:MatDialogRef,@Inject(MAT_DIALOG_DATA) public data:any) { } ngOnInit() { + console.log(this.data) } generateimg(){ console.log("pd") diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.html b/ng8-seed/src/app/components/user-profile/user-profile.component.html index 4069afb..07009af 100644 --- a/ng8-seed/src/app/components/user-profile/user-profile.component.html +++ b/ng8-seed/src/app/components/user-profile/user-profile.component.html @@ -27,26 +27,27 @@ -
+
- -
+ My Profile -