diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index 9928212..11ffaf6 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.html +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -2,11 +2,11 @@
- +
Contribute to Specific Need
-
+
@@ -22,7 +22,7 @@
-
+
@@ -48,8 +48,8 @@ -
- +
+ -
- + Item Needed + {{row.material_name}} @@ -71,17 +71,17 @@ - - + + - - + + - - + + @@ -92,7 +92,7 @@ - + @@ -107,7 +107,7 @@ -
Item Needed {{row.material_name}} Required Qty {{row.qty}} Required Qty {{row.qty}} Received Qty {{row.received_qty}} Received Qty {{row.received_qty}} Balance Qty {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }} Balance Qty {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }} Cost Per Unit
(in Rs) 		Cost Per Unit
(in Rs) 		{{row.cost_per_unit === null?0:row.cost_per_unit}}
+
@@ -121,7 +121,7 @@
- +
@@ -146,7 +146,7 @@ - + diff --git a/ng8-seed/src/app/components/contribute/contribute.component.scss b/ng8-seed/src/app/components/contribute/contribute.component.scss index 93c300a..b7cf608 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.scss +++ b/ng8-seed/src/app/components/contribute/contribute.component.scss @@ -2,17 +2,25 @@ padding: 0px !important; } .sidescroll{ - right: 45px !important; + // right: 45px !important; height: fit-content; - position: fixed; + // position: fixed; z-index: 0; } +@media(max-width:580px){ + .sidescroll{ + height: auto; + position: unset; + // right: -20px; + + } +} a { text-decoration: underline; color: #4CAF50; } table { - width: 100%; + // width: 100%; } .mat-form-field { @@ -42,7 +50,7 @@ a { } .table-responsive { - text-align: left; + text-align: right; } .calculated-shipping { @@ -67,7 +75,7 @@ a { table th { border: none; border-bottom: 1px solid #e9e9e9; - padding: 12px; + padding: 4px; vertical-align: middle; } @@ -107,6 +115,7 @@ a { } } .footer { + z-index: -1; margin:0; width:100%; overflow: hidden; @@ -114,12 +123,13 @@ a { // bottom: 10px; top:20px; // margin:0; - width: 100%; + width: 97%; padding-left:10px; /* Set the fixed height of the footer here */ height: 40px; line-height: 60px; background-color:rgb(69, 189, 189); + } .footer h5{ font-size: 13px; @@ -138,4 +148,5 @@ a { color:gray; text-align: center; font-style: italic; -} \ No newline at end of file +} + diff --git a/ng8-seed/src/app/components/contribute/contribute.component.ts b/ng8-seed/src/app/components/contribute/contribute.component.ts index 8195291..c1ef65b 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.ts +++ b/ng8-seed/src/app/components/contribute/contribute.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; import { environment } from '../../../environments/environment'; import { ApiService } from '../../shared/api.service'; import { FormGroup, FormBuilder, FormControl, Validators, } from '@angular/forms'; @@ -41,6 +41,8 @@ export class ContributeComponent implements OnInit { all_district:any=[]; dataStatus :boolean = true; msg: any; + @ViewChild('table_element',{static:true}) table_element : ElementRef + clientWidth: any; constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService,public schInfo:SchoolDetailsService) { // Create 100 users @@ -161,6 +163,7 @@ export class ContributeComponent implements OnInit { this.dataLength = data.length; this.dataSource.data = data; console.log("data",this.dataSource) + let store:any store=sessionStorage.getItem('contribute') store=JSON.parse(store) @@ -205,6 +208,20 @@ export class ContributeComponent implements OnInit { // console.log(this.finalData) return } + else if(e <= 0){ + alert("Given value is Invalid") + if(this.finalData.length > 0){ + this.finalData=this.finalData.filter(val=>{ + return val.req_id!=curr_data.school_req_id + }) + this.whole_contribute_list=this.whole_contribute_list.filter(val=>val.school_req_id != curr_data.school_req_id) + // console.log(this.finalData); + } + this.sponsor_qty[i]='' + this.Total[i]='' + // console.log(this.finalData) + return + } // console.log(this.finalData); // console.log(e,i,item); this.Total[i] = e*item; @@ -309,6 +326,11 @@ export class ContributeComponent implements OnInit { } this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; + console.log("table elemnt",this.table_element.nativeElement.offsetWidth); + // this.table_element=this.table_element.nativeElement.clientWidth + this.clientWidth=this.table_element.nativeElement.clientWidth + console.log("table elemnt",this.clientWidth); + } diff --git a/ng8-seed/src/app/components/payment/payment.component.html b/ng8-seed/src/app/components/payment/payment.component.html index e6c9cf2..962d507 100644 --- a/ng8-seed/src/app/components/payment/payment.component.html +++ b/ng8-seed/src/app/components/payment/payment.component.html @@ -48,7 +48,7 @@

₹ {{grand_tot_value}}


- + Online  Offline @@ -91,6 +91,8 @@
+
+

A/c Name : Tamil Nadu State Parent Teacher Association - CSR Funds

A/C Number : 142301000022944

@@ -99,8 +101,52 @@

Bank : Indian Overseas Bank

Branch : College Road, Chennai

+ +
+
    -
  • 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.
    • +
  • Tamil Nadu State Parent Teacher Association (TNPTA) 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.
diff --git a/ng8-seed/src/app/components/payment/payment.component.scss b/ng8-seed/src/app/components/payment/payment.component.scss index d227908..8eff256 100644 --- a/ng8-seed/src/app/components/payment/payment.component.scss +++ b/ng8-seed/src/app/components/payment/payment.component.scss @@ -201,3 +201,6 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7); margin-bottom: 4%; font-size: 15px; } +.half-field{ + width: 40%; +} diff --git a/ng8-seed/src/app/components/payment/payment.component.ts b/ng8-seed/src/app/components/payment/payment.component.ts index ae8e5a1..0faa655 100644 --- a/ng8-seed/src/app/components/payment/payment.component.ts +++ b/ng8-seed/src/app/components/payment/payment.component.ts @@ -48,11 +48,14 @@ export class PaymentComponent implements OnInit { contribute_type: any; contributeKind: FormGroup; contribute_params: any; - payment_mode:any="2"; //1-online 2-offline + payment_mode:any; //1-online 2-offline maxDate=new Date() reqjson='' action_url='' loader_control:boolean=false + offlineDetForm:FormGroup; + payment_mode_data=[{id:1,name:"Cheque/DD"},{id:2,name:"Bank Transfer"}] + deposit_mode_data=[{id:1,name:"Despatch"},{id:2,name:"Check Drop"}] constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) { this.isToken(); @@ -84,6 +87,7 @@ export class PaymentComponent implements OnInit { remarks:[''] }) } + // } } ngAfterViewInit() { @@ -158,5 +162,18 @@ export class PaymentComponent implements OnInit { console.log("Error") }) } + changeType(value){ + console.log(value) + if(value.target.innerText == 'Offline'){ + this.offlineDetForm=this.fb.group({ + payment_mode:[''], + check_no:[''], + check_date:[''], + check_branch_bank:[''], + check_deposit_mode:[''] + }) + } + + } } 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 ed0401c..c29f6f4 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 @@ -66,6 +66,20 @@ somethingChanged(e,i,item,mat_id,curr_data){ // console.log(this.finalData) return } + else if(e <= 0){ + alert("Given value is Invalid") + if(this.finalData.length > 0){ + this.finalData=this.finalData.filter(val=>{ + return val.req_id!=curr_data.school_req_id + }) + this.whole_contribute_list=this.whole_contribute_list.filter(val=>val.school_req_id != curr_data.school_req_id) + // console.log(this.finalData); + } + this.sponsor_qty[i]='' + this.Total[i]='' + // console.log(this.finalData) + return + } console.log(curr_data.school_req_id) // console.log(e,i,item); this.Total[i] = e*item; 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 fbc8784..d268021 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 @@
-
+
@@ -28,8 +28,8 @@
-
-
info_outline
+
+
info_outline
+
-

Rs.8,00,000

+

₹{{support_and_req.contributed_amount}}

Contributed

+ +
+
Requirements
+
+
+
+
+

{{support_and_req.no_of_schools_posted}}

+

Schools

+
+ + +
+

₹{{support_and_req.total_amount_required }}

+

Value of Support Needed

+
+
+
+
- + diff --git a/ng8-seed/src/app/dashboard/dashboard.component.ts b/ng8-seed/src/app/dashboard/dashboard.component.ts index 31e1feb..f3f4aca 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.ts +++ b/ng8-seed/src/app/dashboard/dashboard.component.ts @@ -1,5 +1,6 @@ import { Component, ViewChild } from '@angular/core'; import { SlickCarouselComponent } from 'ngx-slick-carousel'; +import { ApiService } from 'app/shared/api.service'; @Component({ selector: 'app-dashboard', @@ -23,7 +24,8 @@ export class DashboardComponent { {img: "assets/images/csr-img/TN_client_logo/12.png"}, {img: "assets/images/csr-img/TN_client_logo/13.png"} ]; - slideConfig = {"slidesToShow": 8, "slidesToScroll": 1,"dots": true,"infinite": true,"autoplay": true,"autoplaySpeed": 1200}; + slideConfig = {"slidesToShow": 8, "slidesToScroll": 1,"dots": false,"infinite": true,"autoplay": true,"autoplaySpeed": 1200}; + support_and_req: any={supporters:'',contributed_amount:'',no_of_schools_posted:'',total_amount_required:''}; // addSlide() { // this.slides.push({img: "http://placehold.it/350x150/777777"}) @@ -53,9 +55,12 @@ export class DashboardComponent { width:string="300px;" imageSources=[{ // url:'https://cdn.vox-cdn.com/uploads/chorus_image/image/56748793/dbohn_170625_1801_0018.0.0.jpg', - url:'assets/images/csr-img/s1.jpg', + url:'assets/images/csr-img/s1m.jpg', // caption:'First' }, + { + url:'assets/images/csr-img/s6m.jpg' + }, { // url:'https://cdn.vox-cdn.com/uploads/chorus_asset/file/9278671/jbareham_170917_2000_0124.jpg', url:'assets/images/csr-img/s2.jpg', @@ -114,8 +119,19 @@ export class DashboardComponent { name:'Kit', card_class:'mc-6' }] - constructor() { + constructor(private apiService:ApiService) { + var tenK=100000 + console.log(tenK.toLocaleString('en-IN')); + this.txt=this.txt; + this.apiService.csrDashboardContent().subscribe(result=>{ + if(result['dataStatus']){ + this.support_and_req=result['records'] + this.support_and_req.contributed_amount=parseInt(this.support_and_req.contributed_amount).toLocaleString('en-IN') + this.support_and_req.total_amount_required=parseInt(this.support_and_req.total_amount_required).toLocaleString('en-IN') + console.log(this.support_and_req) + } + }) } ngAfterViewInit() { // Hack: Scrolls to top of Page after page view initialized 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 baf93a6..3580d8c 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.html @@ -4,7 +4,7 @@
-

+

@@ -29,12 +29,18 @@
--> - + {{ menuitem.icon }} {{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : 'Log Out' : menuitem.name | translate }} {{ badge.value }} + + {{ menuitem.icon }} + {{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : 'Log Out' : menuitem.name | translate }} + + {{ badge.value }} + {{ menuitem.icon }} {{ menuitem.name | translate }} @@ -74,7 +80,11 @@
+ +
{{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : '' : menuitem.name | translate }} 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 816b336..d315ae1 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts @@ -249,7 +249,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { return; } } - if(menuitem.name == 'General Guidelines'){ + if(menuitem.name == 'Guidelines'){ window.open("https://contribute.tnschools.gov.in/img/Champion_Of_Change.pdf") } else{ @@ -276,13 +276,18 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { // return // this.router.navigateByUrl('/user-profile') this.signOut() + return; } else{ // this.router.navigateByUrl('/'+menuitem.state) this.loginScreen() + return; } } + if(menuitem.name == '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/api.service.ts b/ng8-seed/src/app/shared/api.service.ts index cbcf860..cc5b1c8 100644 --- a/ng8-seed/src/app/shared/api.service.ts +++ b/ng8-seed/src/app/shared/api.service.ts @@ -174,6 +174,10 @@ export class ApiService { checkTxnStatus(param){ return this.http.post(apiUrl+'checkTxnStatus',param).pipe(catchError(err=>this.handleError(err))) } + csrDashboardContent(){ + return this.http.get(apiUrl+'csrDashboardContent').pipe + (catchError(err=>this.handleError(err))) + } } diff --git a/ng8-seed/src/app/shared/menu-items/menu-items.ts b/ng8-seed/src/app/shared/menu-items/menu-items.ts index 0579186..814f9c6 100644 --- a/ng8-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng8-seed/src/app/shared/menu-items/menu-items.ts @@ -25,7 +25,7 @@ const MENUITEMS : Menu[] = [ state: 'home', name: 'HOME', type: 'link', - icon: 'explore' + icon: 'home' }, // { // state: 'authentication', @@ -61,6 +61,18 @@ const MENUITEMS : Menu[] = [ type: 'link', icon: 'list' }, + { + state: '', + name: 'Guidelines', + type: 'link', + icon: 'note' + }, + { + state:'user-profile', + name:'My Account', + type:'link', + icon:'account_circle' + }, // { // state: 'apps', // name: 'Pages', diff --git a/ng8-seed/src/assets/images/csr-img/header-bg.png b/ng8-seed/src/assets/images/csr-img/header-bg.png new file mode 100644 index 0000000..8d874af Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/header-bg.png differ diff --git a/ng8-seed/src/assets/images/csr-img/s1.jpg b/ng8-seed/src/assets/images/csr-img/s1.jpg index 4a31eca..247d7be 100644 Binary files a/ng8-seed/src/assets/images/csr-img/s1.jpg and b/ng8-seed/src/assets/images/csr-img/s1.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s1m.jpg b/ng8-seed/src/assets/images/csr-img/s1m.jpg new file mode 100644 index 0000000..247d7be Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/s1m.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s2.jpg b/ng8-seed/src/assets/images/csr-img/s2.jpg index be8a915..8865bac 100644 Binary files a/ng8-seed/src/assets/images/csr-img/s2.jpg and b/ng8-seed/src/assets/images/csr-img/s2.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s3.jpg b/ng8-seed/src/assets/images/csr-img/s3.jpg index 1b5be96..7a20b88 100644 Binary files a/ng8-seed/src/assets/images/csr-img/s3.jpg and b/ng8-seed/src/assets/images/csr-img/s3.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s4.jpg b/ng8-seed/src/assets/images/csr-img/s4.jpg index 0ec856e..7277f77 100644 Binary files a/ng8-seed/src/assets/images/csr-img/s4.jpg and b/ng8-seed/src/assets/images/csr-img/s4.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s5.jpg b/ng8-seed/src/assets/images/csr-img/s5.jpg index 9df0b6d..3fca998 100644 Binary files a/ng8-seed/src/assets/images/csr-img/s5.jpg and b/ng8-seed/src/assets/images/csr-img/s5.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s6.jpg b/ng8-seed/src/assets/images/csr-img/s6.jpg new file mode 100644 index 0000000..85f2639 Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/s6.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/s6m.jpg b/ng8-seed/src/assets/images/csr-img/s6m.jpg new file mode 100644 index 0000000..85f2639 Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/s6m.jpg differ diff --git a/ng8-seed/src/assets/images/csr-img/school_empty.jpg b/ng8-seed/src/assets/images/csr-img/school_empty.jpg new file mode 100644 index 0000000..f6c4680 Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/school_empty.jpg differ diff --git a/ng8-seed/src/assets/styles/scss/core/_main-header.scss b/ng8-seed/src/assets/styles/scss/core/_main-header.scss index 38eee16..88fbf6e 100644 --- a/ng8-seed/src/assets/styles/scss/core/_main-header.scss +++ b/ng8-seed/src/assets/styles/scss/core/_main-header.scss @@ -70,13 +70,19 @@ mat-toolbar { } .branding { - height: 64px; + // height: 214px; padding: 1rem 0; h2 { margin: 0; font-size: 1.8rem; } } +.vertical_nav :hover{ + // padding: 13px; + // font-size: 19px; + // color:cadetblue + color:rgb(167, 195, 196) +} .search-in { .search-bar { @@ -114,7 +120,7 @@ mat-toolbar { } .logo { width: 87px; - height: 20px; + height: 50px; -webkit-background-size: 87px 20px; background-size: 87px 20px; } diff --git a/ng8-seed/src/assets/styles/scss/core/_main-panel.scss b/ng8-seed/src/assets/styles/scss/core/_main-panel.scss index e17e0fb..1ec138c 100644 --- a/ng8-seed/src/assets/styles/scss/core/_main-panel.scss +++ b/ng8-seed/src/assets/styles/scss/core/_main-panel.scss @@ -103,8 +103,10 @@ $mat-toolbar-height-mobile-landscape: 48px !default; .horizontal-menu { // background: #fff; // box-shadow: 0 0px 6px rgba(0, 0, 0, 0.1); + z-index: 3; color:rgb(248, 252, 250); .main-h-list { + z-index:3; padding: 0; margin: 0; >li { diff --git a/ng8-seed/src/assets/styles/scss/core/_main-sidebar.scss b/ng8-seed/src/assets/styles/scss/core/_main-sidebar.scss index 5304505..a4ba6c7 100644 --- a/ng8-seed/src/assets/styles/scss/core/_main-sidebar.scss +++ b/ng8-seed/src/assets/styles/scss/core/_main-sidebar.scss @@ -397,12 +397,34 @@ } .header-cyan{ .mat-toolbar.main-header{ - background: rgb(81, 202, 202) !important + // background: rgb(81, 202, 202) !important; + // background: url('assets/images/csr-img/header-bg.png'); + // background-image: linear-gradient(-70deg,rgb(81, 202, 202),rgba(103, 58, 183, 0.7)); + background-image: linear-gradient(to bottom right,rgb(81, 202, 202),rgba(138, 99, 206, 0.7)); + // background-size: 400px 100px; + // background-repeat: no-repeat; + // opacity: 0.10; + } + } + .header-bg-css{ + display: none; + height: 100px; + width:260px; + opacity:0.10; + position: absolute; + top:1.5%; + left:40%; + z-index: 2; + } + @media(max-width:1072px){ + .header-bg-css{ + display: none; } } .color-cyan{ .mat-toolbar.main-header{ color:rgb(81, 202, 202) !important + } }