diff --git a/ng8-seed/src/app/app.module.ts b/ng8-seed/src/app/app.module.ts index 15f1f5e..5f9eaa6 100644 --- a/ng8-seed/src/app/app.module.ts +++ b/ng8-seed/src/app/app.module.ts @@ -59,6 +59,7 @@ import { ReqListComponent } from './components/req-list/req-list.component'; import { UserProfileComponent } from './components/user-profile/user-profile.component'; import { SuccessComponent } from './components/payment-status/success/success.component'; import { FailureComponent } from './components/payment-status/failure/failure.component'; +import { UserCertificateComponent } from './components/user-certificate/user-certificate.component'; export function HttpLoaderFactory(http: HttpClient) { @@ -91,6 +92,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { UserProfileComponent, SuccessComponent, FailureComponent, + UserCertificateComponent, // ProjectListComponent ], diff --git a/ng8-seed/src/app/app.routing.ts b/ng8-seed/src/app/app.routing.ts index 3d09f8c..13db87b 100644 --- a/ng8-seed/src/app/app.routing.ts +++ b/ng8-seed/src/app/app.routing.ts @@ -15,6 +15,7 @@ import { Component } from '@angular/core'; import { UserProfileComponent } from './components/user-profile/user-profile.component'; import { SuccessComponent } from './components/payment-status/success/success.component'; import { FailureComponent } from './components/payment-status/failure/failure.component'; +import { UserCertificateComponent } from './components/user-certificate/user-certificate.component'; export const AppRoutes: Routes = [{ path: '', redirectTo: 'home', @@ -63,6 +64,10 @@ export const AppRoutes: Routes = [{ path:'user-profile', component:UserProfileComponent }, + { + path:'user-certificate', + component:UserCertificateComponent + }, { canActivate:[AuthGuardService], path:'payment-status/:status', diff --git a/ng8-seed/src/app/components/contribute/contribute.component.ts b/ng8-seed/src/app/components/contribute/contribute.component.ts index 726f25f..1911085 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.ts +++ b/ng8-seed/src/app/components/contribute/contribute.component.ts @@ -319,7 +319,7 @@ export class ContributeComponent implements OnInit { return } if(this.grandTotal ==''){ - alert("Please Fill the amount"); + alert("Please tell us the number of items you would like to contribute"); return } let data = {'records': @@ -364,7 +364,7 @@ export class ContributeComponent implements OnInit { return } if(this.general_devlop_amt ==''){ - alert("Please Fill the amount"); + alert("Please tell us the number of items you would like to contribute"); return } let data = {'records': diff --git a/ng8-seed/src/app/components/payment/payment.component.html b/ng8-seed/src/app/components/payment/payment.component.html index 3351e4b..0f15d61 100644 --- a/ng8-seed/src/app/components/payment/payment.component.html +++ b/ng8-seed/src/app/components/payment/payment.component.html @@ -44,8 +44,8 @@
- - + +

₹ {{grand_tot_value}}


@@ -69,16 +69,18 @@ - +
+    
- +
+    
- - +
+ diff --git a/ng8-seed/src/app/components/register/register-component.html b/ng8-seed/src/app/components/register/register-component.html index 201e571..355c111 100644 --- a/ng8-seed/src/app/components/register/register-component.html +++ b/ng8-seed/src/app/components/register/register-component.html @@ -76,7 +76,7 @@
- I hereby give my consent to share details of my contribution in public domain

+ I hereby consent to share details of my contributions with the public

  I hereby give my consent to receive periodic updates through email and other modes + + Reference + +
{{details.ref_id}}
+ + + + + Tracking + +
{{details.trackid}}
+ + + Payment Mode @@ -169,7 +186,7 @@ -
+
-
Failed
@@ -237,8 +254,15 @@

TAMIL NADU STATE PARENT TEACHER ASSOCIATION

-
-

Ack No. : {{pdf_data_source.trackid}}

+
+ + + + + + + +

Ack No. : {{pdf_data_source.trackid}}

ref_id. : {{pdf_data_source.ref_id}}

Received with thanks, the sum of Rs. {{pdf_data_source.amount}} /- ({{pdf_data_source.numtowords}}) from Mr/Ms. {{pdf_data_source.name}} (PAN : {{pdf_data_source.org_pan}}) as donation towards improvement of Government Schools in Tamil Nadu through the online portal https://contribute.tnschools.gov.in

@@ -259,4 +283,4 @@ Contribution to Tamil Nadu State Parent Teacher Association – CSR Fund is tax
-
\ No newline at end of file + diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.ts b/ng8-seed/src/app/components/user-profile/user-profile.component.ts index 406735c..71a828f 100644 --- a/ng8-seed/src/app/components/user-profile/user-profile.component.ts +++ b/ng8-seed/src/app/components/user-profile/user-profile.component.ts @@ -2,10 +2,12 @@ import { Component, OnInit } from '@angular/core'; import { ApiService } from 'app/shared/api.service'; import { FormGroup, FormBuilder } from '@angular/forms'; import {animate, state, style, transition, trigger} from '@angular/animations'; -import { MatTableDataSource, MatSnackBar } from '@angular/material'; +import { MatTableDataSource, MatSnackBar, MatDialog } from '@angular/material'; import * as jspdf from 'jspdf'; import html2canvas from 'html2canvas'; +import { Router } from '@angular/router'; +import { UserCertificateComponent } from '../user-certificate/user-certificate.component'; @Component({ selector: 'app-user-profile', @@ -24,14 +26,14 @@ export class UserProfileComponent implements OnInit { profile_form:FormGroup; user_data:any; contribution_data:any=[]; - displayedColumns=['Date','contribute_type','payment_mode','tot_amount','payment_ref'] + displayedColumns=['Date','contribute_type','ref_id','trackid','payment_mode','tot_amount','payment_ref'] public dataSource = new MatTableDataSource(); isExpansionDetailRow = (i: number, row: Object) => row.hasOwnProperty('detailRow'); expandedElement: any pdf_data_source: any={amount:'',name:'',org_pan:''}; - constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar) { } + constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar,public router:Router,private matDialog:MatDialog) { } ngOnInit() { this.getProfile() @@ -115,4 +117,16 @@ export class UserProfileComponent implements OnInit { this.modal_hide=true } + closeDialog(){ + this.matDialog.closeAll(); + } + certificateDialog(){ + this.closeDialog() + this.matDialog.open(UserCertificateComponent,{ + "height":"1000px", + "width":"800px", + panelClass: 'custom-modalbox' + }) + } + } 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 267fae7..47fd3f3 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.html @@ -87,7 +87,7 @@
diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts index 9ff678d..fa483c2 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts @@ -241,12 +241,17 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { if(this.user_name != ''){ // return this.router.navigateByUrl('/user-profile') + return; } else{ // this.router.navigateByUrl('/'+menuitem.state) this.loginScreen() + return; } } + if(menuitem.name == 'General Guidelines'){ + window.open("https://contribute.tnschools.gov.in/img/Champion_Of_Change.pdf") + } else{ this.router.navigateByUrl('/'+menuitem.state) } diff --git a/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts index 6a933de..04fc82e 100644 --- a/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -58,12 +58,20 @@ const HORIZONTALMENUITEMS = [ // type: 'link', // icon: 'error_outline' // }, + + { + state: '', + name: 'General Guidelines', + type: 'link', + icon: 'lock' + }, { state: 'authentication', name: 'Login', type: 'link', icon: 'lock' }, + // { // state: 'apps', // name: 'APPS',