From 27fb4a9a3ef7af876c23ceb3e30ffeb617540a49 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Sat, 28 Sep 2019 19:30:47 +0530 Subject: [PATCH] changes by suren --- .../project-detail.component.html | 102 +++++++++++++++--- .../project-detail.component.scss | 8 ++ .../project-detail.component.ts | 14 ++- .../project-list/project-list.component.html | 2 +- .../project-list/project-list.component.ts | 4 +- .../app/session/login/login-component.html | 2 +- .../session/register/register-component.html | 21 +++- .../session/register/register.component.ts | 33 +++++- ng8-seed/src/app/session/session.module.ts | 4 +- .../src/app/shared/school-details.service.ts | 2 +- 10 files changed, 162 insertions(+), 30 deletions(-) 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 7c7cb4e..a6b6543 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 @@ -3,11 +3,11 @@
-

Building Fund

+

{{schoolInfo.school_name}}

- Home ⇀ - Project ⇀ - Details +
@@ -32,13 +32,83 @@

{{schoolInfo.school_name}}

-
- -

{{schoolInfo.district_name}}

- -
+

{{schoolInfo.block_name}} Block, {{schoolInfo.district_name}} District

+
{{schoolInfo.management}} - {{schoolInfo.category}}
+
+
-
+
+
+
Classes
+
+
+
+ +
{{schoolInfo.low_class === '13' ? 'LKG': schoolInfo.low_class === '14' ? 'UKG' : schoolInfo.low_class === '15' ? 'Pre-kg' : schoolInfo.low_class}} - {{schoolInfo.high_class === '13' ? 'LKG': schoolInfo.high_class === '14' ? 'UKG' : schoolInfo.high_class === '15' ? 'Pre-kg' : schoolInfo.high_class}}
+
+
+ +
+
+
+
Students
+
+
+
+ +
  {{schoolInfo.total}}
+
+
+
+
+ +
  {{schoolInfo.total_b}}
+
+
+
+
+ +
  {{schoolInfo.total_g}}
+
+
+ +
+
+
+
Staff
+
+
+
+ +
  {{schoolInfo.totstaff}}
+
+
+
+
+
  {{schoolInfo.teach_tot}}
+
+

Teaching

+
+
+
+
  {{schoolInfo.nonteach_tot}}
+
+

Non-Teaching

+
+ +
+ + +
+
+ +
+
+ +
-

About Project

+

Requirements

- Project Info + Requirement Details -

Tamil Nadu is one of the most literate states in India. The state's literacy rate is 80.33% in 2011, which is above the national average. A survey conducted by the Industry body Assocham ranks Tamil Nadu top among Indian states with about 100% Gross Enrollment Ratio (GER) in primary and upper primary education.

@@ -113,6 +182,11 @@
Details{{schoolInfo.qty}}
+
+
+ +
+
diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.scss b/ng8-seed/src/app/components/project-detail/project-detail.component.scss index bd88331..b0925d1 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.scss +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.scss @@ -1,6 +1,13 @@ mat-card{ overflow: visible; } +.mat-raised-button{ + color:#fff; + background-color: #51caca; +} +.temp{ + font-size: 25px; +} .sch_details{ height: 65px; color: #fff; @@ -89,6 +96,7 @@ td, th { border: 1px solid #dddddd; text-align: left; padding: 1%; + font-size: 16px; } tr:nth-child(even) { 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 72a112f..838895b 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 @@ -3,7 +3,8 @@ import { environment } from 'environments/environment'; import { ApiService } from 'app/shared/api.service'; import { FormBuilder } from '@angular/forms'; import { Router } from '@angular/router'; -import { SchoolDetailsService } from 'app/shared/school-details.service'; +import { SchoolDetailsService } from 'app/shared/school-details.service'; +import { MatDialogRef, MatDialogConfig, MatDialog } from '@angular/material'; @Component({ selector: 'app-project-detail', @@ -11,14 +12,14 @@ import { SchoolDetailsService } from 'app/shared/school-details.service'; styleUrls: ['./project-detail.component.scss'] }) export class ProjectDetailComponent implements OnInit { + @ViewChild('slider',{static:false}) sliderimg - imageSources=[]; - school_list : any []; + imageSources=[]; - schoolInfo: any ; + schoolInfo: any ; // types_of_funds=['State Fund','District Fund','School common Fund','For this Project'] - constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,public schInfo:SchoolDetailsService) { } + constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,public schInfo:SchoolDetailsService,public dialog: MatDialog) { } ngOnInit() { @@ -80,4 +81,7 @@ export class ProjectDetailComponent implements OnInit { this.sliderimg.goToSlide(index); } + + } + \ No newline at end of file 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 2292b6c..a7c9b7f 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 438e3ba..33690d4 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 @@ -28,7 +28,9 @@ export class ProjectListComponent implements OnInit { this.restApi.get(url).subscribe(schDet=> { // console.log(schDet); + // this.school_list = schDet['records'].filter(sch=>sch.is_featured==this.is_featured)[0]; this.school_list = schDet['records']; + this.school_list = this.school_list.filter(sch=>sch.is_featured==1); // console.log(this.school_list); }) @@ -48,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}; + 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}; this.schInfo.updateDetails(data); this.router.navigate(['/home/project-detail']); diff --git a/ng8-seed/src/app/session/login/login-component.html b/ng8-seed/src/app/session/login/login-component.html index 299a14a..9ffc678 100644 --- a/ng8-seed/src/app/session/login/login-component.html +++ b/ng8-seed/src/app/session/login/login-component.html @@ -15,7 +15,7 @@ -

Forgot password?

+

Don't have an account? Register Here