From 25a064598fe41877c2a5e239f98c8fc1b8685561 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Sat, 28 Sep 2019 12:06:37 +0530 Subject: [PATCH] changes by Suren --- ng8-seed/src/app/app.module.ts | 3 +- .../contribute/contribute.component.html | 46 +++++---- .../contribute/contribute.component.ts | 28 +++++- .../project-detail.component.html | 98 ++++++++++++------- .../project-detail.component.scss | 9 ++ .../project-detail.component.ts | 72 ++++++++++---- .../project-list/project-list.component.html | 16 +-- .../project-list/project-list.component.ts | 25 +++-- .../layouts/admin/admin-layout.component.html | 2 +- .../menu-items/horizontal-menu-items.ts | 24 ++--- .../app/shared/school-details.service.spec.ts | 12 +++ .../src/app/shared/school-details.service.ts | 17 ++++ 12 files changed, 244 insertions(+), 108 deletions(-) create mode 100644 ng8-seed/src/app/shared/school-details.service.spec.ts create mode 100644 ng8-seed/src/app/shared/school-details.service.ts diff --git a/ng8-seed/src/app/app.module.ts b/ng8-seed/src/app/app.module.ts index 3cb7caf..3d76172 100644 --- a/ng8-seed/src/app/app.module.ts +++ b/ng8-seed/src/app/app.module.ts @@ -49,6 +49,7 @@ import { MyAccountComponent } from './components/my-account/my-account.component import { TokenInterceptorService } from './shared/guards/token-interceptor.service'; import { AuthGuardService } from './shared/guards/auth-guard.service'; import { MatTableDataSource, MatTableModule } from '@angular/material'; +import { SchoolDetailsService } from './shared/school-details.service'; // import { AddEventModule } from './add-event.module'; export function HttpLoaderFactory(http: HttpClient) { @@ -121,7 +122,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { provide:HTTP_INTERCEPTORS, useClass: TokenInterceptorService, multi: true - },AuthGuardService, + },AuthGuardService,SchoolDetailsService, ], entryComponents: [], bootstrap: [AppComponent] diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index 44703af..f30372e 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 @@
-
Be a Champion of Change
+
Contribute to Specific Need
@@ -52,39 +52,45 @@ - - + + - - - - + + + + + + + + + + - - + + - - - + + + - + - - + + @@ -106,8 +112,8 @@
- - + +
@@ -132,7 +138,7 @@ -
Or Contribute to General Development Fund
+
Contribute to General Development Fund
 @@ -145,8 +151,8 @@ - -

Thiruvannamalai

- +

{{schoolInfo.district_name}}

+
-

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.

+
+
+ +
Total Boys
+

{{schoolInfo.total_b}}

+ +
+
+ +
Total Girls
+

{{schoolInfo.total_g}}

+ +
+
+ +
Total
+

{{schoolInfo.total}}

+ +
+
+
+
+ +
Teacher
+

{{schoolInfo.teach_tot}}

+ +
+
+ +
Non-Teacher
+

{{schoolInfo.nonteach_tot}}

+ +
+
+ +
Total Staff
+

{{schoolInfo.totstaff}}

+ +
+
+ - + -->
- +

About Project

@@ -60,24 +100,23 @@
ImageRequirement School Img Description{{row.material_name}} required at {{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District.Item Need {{row.material_name}} School {{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District. Requirement Qty Required Qty {{row.qty}} Sponsor Sponsor Qty Cost Per Unit Cost Per Unit (in RS) {{row.cost_per_unit === null?0:row.cost_per_unit}} Total Amount (in RS) {{Total[i]}}
+ + - - - - - - - - - + + + + + +
DetailsMaterial Name Estimation CollectedQty
Furniture1.50L50,000
Building1.50L80,000
{{schoolInfo.cat_name}}{{schoolInfo.material_name}}{{schoolInfo.total_cost}}{{schoolInfo.total_recevied}}{{schoolInfo.qty}}
- + - - + + - - - + -->