Choose a Payment Option
-
+
-
+ +
+ Online
+ Offline
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/req-list/req-list.component.scss b/ng8-seed/src/app/components/req-list/req-list.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/ng8-seed/src/app/components/req-list/req-list.component.spec.ts b/ng8-seed/src/app/components/req-list/req-list.component.spec.ts
new file mode 100644
index 0000000..0b341dc
--- /dev/null
+++ b/ng8-seed/src/app/components/req-list/req-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReqListComponent } from './req-list.component';
+
+describe('ReqListComponent', () => {
+ let component: ReqListComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ReqListComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ReqListComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng8-seed/src/app/components/req-list/req-list.component.ts b/ng8-seed/src/app/components/req-list/req-list.component.ts
new file mode 100644
index 0000000..2d4984a
--- /dev/null
+++ b/ng8-seed/src/app/components/req-list/req-list.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
+
+@Component({
+ selector: 'app-req-list',
+ templateUrl: './req-list.component.html',
+ styleUrls: ['./req-list.component.scss']
+})
+export class ReqListComponent implements OnInit {
+ dataSource:any = new MatTableDataSource();
+ dataLength :number;
+ @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
+ @ViewChild(MatSort, {static: true}) sort: MatSort;
+ pageSize = 10;
+ displayedColumns: string[] = ['Requirement', 'Item Need', 'School', 'Required Qty', 'Sponsor Qty', 'Cost Per Unit', 'Amount'];
+ constructor() {
+
+ }
+
+ ngOnInit() {
+ let list_req= sessionStorage.getItem('contribute-selected-list')
+ list_req=JSON.parse(list_req)
+ console.log(list_req);
+ if(list_req.length > 0){
+ this.dataLength = list_req.length;
+ this.dataSource.data = list_req;
+ }
+ }
+
+}
diff --git a/ng8-seed/src/app/dashboard/dashboard.routing.ts b/ng8-seed/src/app/dashboard/dashboard.routing.ts
index e03bb18..d5a4e9c 100644
--- a/ng8-seed/src/app/dashboard/dashboard.routing.ts
+++ b/ng8-seed/src/app/dashboard/dashboard.routing.ts
@@ -8,6 +8,7 @@ export const DashboardRoutes: Routes = [{
component: DashboardComponent
},{
path:'project-detail',
+ data:{some_data:'some value'},
component:ProjectDetailComponent
}];
diff --git a/ng8-seed/src/app/session/login/login.component.ts b/ng8-seed/src/app/session/login/login.component.ts
index 2476577..636b873 100644
--- a/ng8-seed/src/app/session/login/login.component.ts
+++ b/ng8-seed/src/app/session/login/login.component.ts
@@ -3,6 +3,8 @@ import {Router, NavigationEnd} from "@angular/router";
import { FormControl, FormBuilder } from '@angular/forms';
import { environment } from 'environments/environment';
import { ApiService } from 'app/shared/api.service';
+import { Location } from "@angular/common";
+import { MatDialog } from '@angular/material';
@Component({
selector: 'ms-login-session',
@@ -17,13 +19,14 @@ export class LoginComponent {
loginForm: any;
previousUrl: string;
- constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router) {
+ constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private location:Location,private matDialog:MatDialog) {
// console.log(this.router.events);
}
ngOnInit() {
+ console.log("d",sessionStorage.getItem('contribute'))
// this.getSchoolReqList();
this.initForm();
// console.log(this.router.events);
@@ -63,9 +66,12 @@ this.previousUrl = this.restApi.getPreviousUrl();
this.restApi.setToken(schDet.token);
if(this.router.url==this.previousUrl)
{
- this.router.navigate(['/home']);
+ this.router.navigate(['/home']);
+ // this.matDialog.closeAll()
}else{
- this.router.navigate([this.previousUrl]);
+ // this.router.navigate([this.previousUrl]);
+ // this.location.back();
+ this.matDialog.closeAll()
}
// this.router.navigate(['/home']);
diff --git a/ng8-seed/src/app/shared/api.service.ts b/ng8-seed/src/app/shared/api.service.ts
index 3140eb1..2319a1d 100644
--- a/ng8-seed/src/app/shared/api.service.ts
+++ b/ng8-seed/src/app/shared/api.service.ts
@@ -4,7 +4,7 @@ import { environment } from '../../environments/environment';
import { Observable,from,of, BehaviorSubject } from 'rxjs';
-import { delay } from 'rxjs/internal/operators';
+import { delay, catchError } from 'rxjs/internal/operators';
import 'rxjs/Rx';
import 'rxjs/add/operator/toPromise';
@@ -78,10 +78,11 @@ export class ApiService {
let token = {};
+ if(t){
token['raw'] = t;
token['header'] = JSON.parse(window.atob(t.split('.')[0]));
token['payload'] = JSON.parse(window.atob(t.split('.')[1]));
-
+ }
return (token);
}
@@ -128,9 +129,23 @@ export class ApiService {
isToken()
{
-
+ this.Token()
return this.expToken.value;
}
+ //API FOR CONTRIBUTE PAGE
+ csrContribute(DATA){
+ let token_decode=this.jwtDecode(localStorage.getItem('token'))
+ if(token_decode){
+ DATA.records.user_id=token_decode['payload'].username
+ }
+ console.log("dd",token_decode)
+ return this.http.post(apiUrl+'csrContribute',DATA).pipe
+ ()
+ }
+
+ getIndividualSchoolReqData(req_id){
+ return this.http.get(apiUrl+'getIndividualSchoolReqData/'+req_id)
+ }
}
diff --git a/ng8-seed/src/app/shared/guards/auth-guard.service.ts b/ng8-seed/src/app/shared/guards/auth-guard.service.ts
index 07e7d68..8d60cd1 100644
--- a/ng8-seed/src/app/shared/guards/auth-guard.service.ts
+++ b/ng8-seed/src/app/shared/guards/auth-guard.service.ts
@@ -2,21 +2,38 @@ import { Injectable } from '@angular/core';
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateChild } from '@angular/router';
import { Router } from '@angular/router';
import { ApiService } from '../api.service';
+import { MatDialog, MatDialogConfig } from '@angular/material';
+import { AuthLayoutComponent } from 'app/layouts/auth/auth-layout.component';
+import { LoginComponent } from '../../components/login/login.component';
@Injectable({
providedIn: 'root'
})
export class AuthGuardService implements CanActivate{
- constructor(public router:Router,public api:ApiService) {
+ constructor(public router:Router,public api:ApiService,private matDialog:MatDialog) {
}
canActivate(): boolean {
-
- return this.api.isToken();
-
-
+ console.log("can activate",this.api.isToken())
+ if(this.api.isToken()){
+ return this.api.isToken();
+
+ }
+ else{
+ const dialogConfig = new MatDialogConfig();
+
+ dialogConfig.disableClose = true;
+ dialogConfig.autoFocus = true;
+ this.matDialog.open(LoginComponent,{
+ height: '450px',
+ width: '400px',
+ panelClass: 'custom-modalbox'
+ })
+ // this.router.navigate(['/authentication'])
+ return false
+ }
}
}
diff --git a/ng8-seed/src/assets/styles/app.scss b/ng8-seed/src/assets/styles/app.scss
index d966db7..9a273c5 100644
--- a/ng8-seed/src/assets/styles/app.scss
+++ b/ng8-seed/src/assets/styles/app.scss
@@ -44,4 +44,9 @@ Author: TrendSetter Themes
@import "scss/core";
@import "scss/material";
@import "scss/utilities/utilities";
+.custom-modalbox {
+ mat-dialog-container {
+ padding: 0;
+ }
+}
₹ 70,000
+₹ {{grand_tot_value}}
+ +
+
+
+
+
+
+
+
+
-
-
- Government of Tamil Nadu accepts online voluntary contributions using Net Banking or VISA-Debit/Credit Cards in Indian Rupees (INR) from Individuals, Organizations, Trusts,Companies and Institutions etc. +
- Government of Tamil Nadu accepts online voluntary contributions using Net Banking or VISA-Debit/Credit Cards in Indian Rupees (INR) from Individuals, Organizations, Trusts,Companies and Institutions etc.
- All contributions towards Tamil Nadu State Parent Teacher Association (TNPTA) are exempt from Income Tax under section 80 (G).
- The PAN Number of Tamil Nadu State Tamil Nadu Parent Teacher Association (TNPTA) is AACAT2920R.
-
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/payment/payment.component.scss b/ng8-seed/src/app/components/payment/payment.component.scss
index b2b03dc..84e14cc 100644
--- a/ng8-seed/src/app/components/payment/payment.component.scss
+++ b/ng8-seed/src/app/components/payment/payment.component.scss
@@ -177,4 +177,10 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7);
}
}
}
+ .amount{
+ text-align: center;
+ float: inline-start;
+ align-content: center;
+ color: black;
+ }
}
diff --git a/ng8-seed/src/app/components/payment/payment.component.ts b/ng8-seed/src/app/components/payment/payment.component.ts
index f5c2163..38ef0ee 100644
--- a/ng8-seed/src/app/components/payment/payment.component.ts
+++ b/ng8-seed/src/app/components/payment/payment.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
-import { FormBuilder } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
import { ApiService } from 'app/shared/api.service';
@Component({
@@ -42,13 +42,44 @@ export class PaymentComponent implements OnInit {
value: 'milk-8',
viewValue: 'Milk'
}];
- constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router) {
+ isCardShow:boolean = false
+ grand_tot_value: string;
+ contribute_type: any;
+ contributeKind: FormGroup;
+ contribute_params: any;
+ payment_mode:any='offline';
+ constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) {
this.isToken();
}
ngOnInit() {
+
// window.localStorage.clear();
+ let values= sessionStorage.getItem('contribute-selected-list')
+ console.log(values)
+ if(values){
+ this.isCardShow=true
+ }
+ let grand_total=sessionStorage.getItem('contribute_final_total')
+ console.log(grand_total)
+ if(grand_total){
+ this.grand_tot_value=grand_total
+ }
+
+ this.contribute_params=sessionStorage.getItem('contribute-params')
+ this.contribute_params=JSON.parse(this.contribute_params)
+ // console.log("parm",contribute_params[''].records)
+ this.contribute_type= this.contribute_params.records.cont_type
+ console.log("ty",this.contribute_type)
+ if(this.contribute_type == '2'){
+ this.contributeKind=this.fb.group({
+ delivery_point:[''],
+ do_delivery:[''],
+ remarks:['']
+ })
+ }
+ // }
}
isToken(){
// console.log(this.restApi.isToken());
@@ -60,5 +91,24 @@ export class PaymentComponent implements OnInit {
}
}
+ proceed_for_payment(){
+ let params=this.contribute_params
+ if(this.contribute_type == '2'){
+ params.records.mat_delivery_point=this.contributeKind.value.delivery_point
+ params.records.mat_delivery_date=this.contributeKind.value.do_delivery
+ params.records.gen_dev_fund_remarks=this.contributeKind.value.remarks
+ }
+ params.records.payment_mode=this.payment_mode
+ this.apiService.csrContribute(params).subscribe(result=>{
+ if(result['dataStatus']){
+ this.router.navigate(['/'],{replaceUrl:true})
+ }
+ else{
+ console.log("something went wrong")
+ }
+ },err=>{
+ console.log("Error")
+ })
+ }
}
diff --git a/ng8-seed/src/app/components/register/register-component.html b/ng8-seed/src/app/components/register/register-component.html
new file mode 100644
index 0000000..c014909
--- /dev/null
+++ b/ng8-seed/src/app/components/register/register-component.html
@@ -0,0 +1,61 @@
+
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/register/register-component.scss b/ng8-seed/src/app/components/register/register-component.scss
new file mode 100644
index 0000000..c1b6b45
--- /dev/null
+++ b/ng8-seed/src/app/components/register/register-component.scss
@@ -0,0 +1,15 @@
+.register-account {
+ background-color: #fff;
+}
+.close_icon{
+ // float: right;
+ text-align: right;
+ color: gray;
+ margin: 0px;
+ padding: 0px;
+}
+.close_icon:hover {
+ transition: transform 1.5s;
+ // color: blue;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/register/register.component.ts b/ng8-seed/src/app/components/register/register.component.ts
new file mode 100644
index 0000000..c44f253
--- /dev/null
+++ b/ng8-seed/src/app/components/register/register.component.ts
@@ -0,0 +1,70 @@
+import { Component, OnInit,ViewEncapsulation } from '@angular/core';
+import {Router} from "@angular/router";
+import { environment } from '../../../environments/environment';
+import { ApiService } from '../../shared/api.service';
+import { FormBuilder, FormControl } from '@angular/forms';
+import { MatDialog } from '@angular/material';
+
+@Component({
+ selector: 'ms-register-session',
+ templateUrl:'./register-component.html',
+ styleUrls: ['./register-component.scss'],
+ encapsulation: ViewEncapsulation.None,
+})
+export class RegisterComponent {
+
+ name: string;
+ email: string;
+ password: string;
+ passwordConfirm: string;
+ go_reg: any;
+
+ constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private matDialog:MatDialog) { }
+
+ ngOnInit() {
+ // this.getSchoolReqList();
+ this.initForm();
+ }
+
+
+ initForm()
+ {
+ this.go_reg = this.fb.group(
+ {
+ id: new FormControl(''),
+ name: new FormControl(''),
+ email: new FormControl(''),
+ mobile: new FormControl(''),
+ password: new FormControl(''),
+ org_info: this.fb.group({
+ orgname: new FormControl(''),
+ org_address: new FormControl(''),
+ org_pan: new FormControl('')
+ }),
+ "created_by":"1",
+ "updated_by":"1"
+
+ })
+ }
+
+ csrUserRegistration()
+ {
+ // console.log(this.go_reg.value);return false;
+ let url = `${environment.apiUrl}${'csrUserRegistration'}`;
+ let data = this.go_reg.value;
+ this.restApi.post(url,data).subscribe(schDet=>
+ {
+ this.router.navigate(['/authentication/login']);
+ })
+ }
+ register() {
+ this.router.navigate(['/']);
+ }
+ closeDialog(){
+ this.matDialog.closeAll();
+ }
+
+}
+
+
+
diff --git a/ng8-seed/src/app/components/req-list/req-list.component.html b/ng8-seed/src/app/components/req-list/req-list.component.html
new file mode 100644
index 0000000..c03afb8
--- /dev/null
+++ b/ng8-seed/src/app/components/req-list/req-list.component.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+ close
+
+ Already Registered ? Login Here
+
+
+ Register as a new user
+We would need some of your information to facilitate your contributions and keep you updated on the progress of the projects or new projects
+ +| Requirement | +Item Need | +{{row.material_name}} | +School | +{{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District. | +Required Qty | +{{row.qty}} | +Sponsor Qty | +{{row.sponsor_qty}} | +Cost Per Unit (in RS) | +{{row.cost_per_unit === null ? 0 : row.cost_per_unit}} | + +Amount (in RS) | +{{row.amount}} | + +
|---|