+
-
+
Page Title
@@ -310,9 +407,9 @@
-
Yours faithfully
-
-
Secretary
+
Yours faithfully
+
+
Secretary
Tamil Nadu State Parent Teacher Association
@@ -325,6 +422,5 @@
-
\ No newline at end of file
+
Ⓒ TN Schools, All rights reserved |
+
diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.scss b/ng8-seed/src/app/components/user-profile/user-profile.component.scss
old mode 100644
new mode 100755
index 0d54dc9..02068ab
--- a/ng8-seed/src/app/components/user-profile/user-profile.component.scss
+++ b/ng8-seed/src/app/components/user-profile/user-profile.component.scss
@@ -137,6 +137,9 @@
.trackid-paid-web{
display: none;
}
+ .mat-column-view_btn{
+ justify-content: flex-end;
+ }
}
@media(min-width:590px){
@@ -218,4 +221,7 @@
a{
text-decoration: underline;
color: blue;
+ }
+ .mat-column-view_btn{
+ justify-content: center;
}
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.spec.ts b/ng8-seed/src/app/components/user-profile/user-profile.component.spec.ts
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
index e290e60..4675362
--- 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,7 +2,7 @@ import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
import { ApiService } from 'app/shared/api.service';
import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
import {animate, state, style, transition, trigger} from '@angular/animations';
-import { MatTableDataSource, MatSnackBar, MatDialog } from '@angular/material';
+import { MatTableDataSource, MatSnackBar, MatDialog, MatBottomSheet, MatPaginator } from '@angular/material';
import * as jspdf from 'jspdf';
import {environment} from 'environments/environment'
@@ -10,6 +10,8 @@ import html2canvas from 'html2canvas';
import { Router } from '@angular/router';
import { UserCertificateComponent } from '../user-certificate/user-certificate.component';
import { PasswordChangeComponent } from '../password-change/password-change.component';
+import { EditUserDetailsComponent } from 'app/edit-user-details/edit-user-details.component';
+import { BottomSheetComponent } from 'app/common/bottom-sheet/bottom-sheet.component';
@Component({
selector: 'app-user-profile',
@@ -27,9 +29,13 @@ export class UserProfileComponent implements OnInit {
modal_hide:boolean=true
profile_form:FormGroup;
user_data:any;
+ req_id:any;
contribution_data:any=[];
- displayedColumns=['Date','contribute_type','payment_mode','trackid','ref_id','tot_amount','payment_ref']
+ kt_contribution_data:any=[];
+ displayedColumns1 =['Date','cont_type','Description','district_name','view_btn']
+ displayedColumns=['Date','contribute_type','payment_mode','trackid','ref_id','tot_amount','payment_ref','EditUser_Details']
public dataSource = new MatTableDataSource();
+ public dataSource1 = new MatTableDataSource();
isExpansionDetailRow = (i: number, row: Object) => row.hasOwnProperty('detailRow');
expandedElement: any
pdf_data_source: any={amount:'',name:'',org_pan:''};
@@ -38,8 +44,11 @@ export class UserProfileComponent implements OnInit {
@ViewChild('table_element',{static:true}) table_element
clientWidth: any;
certificate_success_date: any='';
+ pageSize = 10;
+ @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
+ @ViewChild('KTContribute', {static: true}) paginator1: MatPaginator;
- constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar,public router:Router,private matDialog:MatDialog,private restApi:ApiService) { }
+ constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar,public router:Router,private matDialog:MatDialog,private restApi:ApiService,private _bottomSheet: MatBottomSheet) { }
ngOnInit() {
this.getProfile()
@@ -61,9 +70,18 @@ export class UserProfileComponent implements OnInit {
})
//this.generatePDF()
}
+ // applyFilter(filterValue: string) {
+ // this.dataSource.filter = filterValue.trim().toLowerCase();
+
+ // if (this.dataSource.paginator) {
+ // this.dataSource.paginator.firstPage();
+ // }
+ // }
ngAfterViewInit(){
setTimeout(()=>{
- console.log("table elemnt",this.table_element);
+ console.log("table elemnt",this.paginator,this.dataSource.paginator);
+ // this.dataSource.paginator = this.paginator;
+ this.dataSource1.paginator=this.paginator1
// this.table_element=this.table_element.nativeElement.clientWidth
this.clientWidth=this.table_element.nativeElement.clientWidth
console.log("table elemnt",this.clientWidth);
@@ -87,6 +105,8 @@ export class UserProfileComponent implements OnInit {
this.contribution_data.forEach(element=>{
element.detailRow=true;
})
+
+
console.log("con",this.contribution_data,this.isExpansionDetailRow);
this.contribution_data=this.contribution_data.filter(val=>{
if(val.payment_mode == '0' && val.cont_type !=2){
@@ -96,9 +116,29 @@ export class UserProfileComponent implements OnInit {
return val;
}
})
+ this.kt_contribution_data=res['records'].kt_contribution_data
+ this.kt_contribution_data.forEach(element=>{
+ element.detailRow=true;
+ })
+
+ //console.log("con",this.kt_contribution_data,this.isExpansionDetailRow);
+ this.kt_contribution_data=this.kt_contribution_data.filter(val1=>{
+ if(val1.payment_mode == '0' && val1.cont_type !=2){
+
+ }
+ else
+ {
+ return val1;
+ }
+ })
this.certificate_success_date=this.contribution_data.filter(val=>val.txnstatus == 'SUCCESS').map(val=>val.contribute_date)[0];
console.log(this.certificate_success_date)
- this.dataSource=this.contribution_data;
+ this.dataSource.data=this.contribution_data;
+ this.dataSource1.data=this.kt_contribution_data;
+ console.log(this.dataSource1);
+
+ setTimeout(() => {this.dataSource.paginator = this.paginator;this.dataSource1.paginator = this.paginator1
+ console.log("tiem",this.dataSource1.paginator,this.dataSource.paginator)});
}
})
}
@@ -240,4 +280,44 @@ export class UserProfileComponent implements OnInit {
})
}
+ openUpdateStatusModel(det) {
+
+ this.apiService.getStatusUpdates(det.req_id).subscribe(res => {
+ if (res['dataStatus']) {
+ this.user_data = res['records']
+ console.log("FOR");
+ console.log(this.user_data);
+ console.log(det);
+
+
+ if (res['records'].length == 0) {
+
+ alert("No Details Found!!");
+ }
+ else {
+ // for(let i = 0; i < this.user_data.length; i++) {
+
+ this.matDialog.open(EditUserDetailsComponent, {
+ "height": "560px",
+ "width": "1020px",
+ panelClass: 'custom-modalbox',
+
+ data: { update: this.user_data, school: det.school_name }
+
+ })
+ }
+
+
+ }
+
+
+ })
+ }
+ viewKCDetails(datas){
+ console.log(datas)
+ this._bottomSheet.open(BottomSheetComponent, {panelClass:'bottom-sheet-width',
+ data: { datas: datas }})
+ }
+
+
}
diff --git a/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.html b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.html
new file mode 100644
index 0000000..ee81b5c
--- /dev/null
+++ b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.html
@@ -0,0 +1,138 @@
+
+
Books Information
+
+
+
{{i+1}}
+
+
+ menu_book
+
+
+ {{value.book}}
+
+
+
+
+
+ person
+
+
+ {{value.author}}
+
+
+
+
+ money
+
+
+ {{value.qty}} Nos
+
+
+
+
+ note
+
+
+ {{displayData.description}}
+
+
+
+
+
+
+
+
+
+
+
{{displayData.con_sub_type == '1' ? 'Mobile' : displayData.con_sub_type == '2' ? 'Device' : displayData.electric_other}} Information
+
+
+
{{i+1}}
+
+
+ dns
+
+
+ {{value.model}}
+
+
+
+
+
+ format_list_numbered_rtl
+
+
+ {{value.serial_no}}
+
+
+
+
+ settings_applications
+
+
+ {{value.accessoris}} Nos
+
+
+
+
+ note
+
+
+ {{displayData.description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
Volunteer Information
+
+
+
{{i+1}}
+
+
+ date_range
+
+
+ {{value.date_from}} - {{value.date_to}}
+
+
+
+
+
+ access_time
+
+
+ {{value.time_from}} - {{value.time_to}}
+
+
+
+
+ subject
+
+
+ {{value.subject_names}}
+
+
+
+
+ note
+
+
+ {{value.kt_type_desc}}
+
+
+
+
+
+
+
+
+
No Details Found
+
diff --git a/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.scss b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.scss
new file mode 100644
index 0000000..d8ae6c1
--- /dev/null
+++ b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.scss
@@ -0,0 +1,33 @@
+.hm_info{
+ display: inline;
+ // white-space: pre-wrap;
+ // word-wrap:break-word;
+ white-space: pre-wrap;
+ }
+ // .hm_icon{
+ // // border-right: 2px solid black;
+ // // border-bottom-left-radius: 10px;
+ // // border-bottom-right-radius: 10px;
+ // }
+ @media(max-width:580px){
+ .hm_info{
+ display: inline;
+ font-size: 12px;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ // word-wrap:break-word;
+ // white-space: pre;
+ }
+ }
+ hr { color: gray; margin: 0.5em auto; margin-left: 0;
+ margin-right: 0;
+ }
+ .index{
+ display: inline;
+ white-space: pre;
+ }
+ @media(max-width:580px){
+ .index{
+ display: none;
+ }
+ }
diff --git a/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.spec.ts b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.spec.ts
new file mode 100644
index 0000000..7123c1c
--- /dev/null
+++ b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VolunteerInfoComponent } from './volunteer-info.component';
+
+describe('VolunteerInfoComponent', () => {
+ let component: VolunteerInfoComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ VolunteerInfoComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(VolunteerInfoComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.ts b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.ts
new file mode 100644
index 0000000..52cf081
--- /dev/null
+++ b/ng8-seed/src/app/components/user-profile/volunteer-info/volunteer-info.component.ts
@@ -0,0 +1,88 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { ApiService } from 'app/shared/api.service';
+import { ApiServiceService } from 'app/knowledge-sharing/services/api-service.service';
+import { Subject } from 'rxjs';
+
+@Component({
+ selector: 'app-volunteer-info',
+ templateUrl: './volunteer-info.component.html',
+ styleUrls: ['./volunteer-info.component.scss']
+})
+export class VolunteerInfoComponent implements OnInit {
+ @Input()displayData:any=[];
+ subjectList: any=[];
+ value_for_display:any=[]
+ constructor(private apiService:ApiServiceService) {
+ console.log(this.displayData)
+ }
+
+ ngOnInit() {
+
+
+ }
+ ngOnChanges(){
+ console.log(this.displayData)
+ this.displayDataFun()
+
+ // this.displayData.push(this.displayData[0])
+ // this.displayData.push(this.displayData[0])
+ // this.displayData.push(this.displayData[0])
+ }
+ displayDataFun(){
+ switch(this.displayData.con_type){
+ case '1':
+ if(this.displayData.hasOwnProperty('books_info')){
+ this.value_for_display=this.displayData.books_info
+ }
+ break;
+ case '2':
+ if(this.displayData.hasOwnProperty('devices_info')){
+ this.value_for_display=this.displayData.devices_info
+ }
+ break;
+ case '3':
+ if(this.displayData.hasOwnProperty('volunteer_info')){
+ if(this.subjectList.length == 0){
+ this.apiService.getListofSubjects().subscribe(response=>{
+ this.subjectList=response['records']
+ this.replaceSubjects()
+ })
+ }
+ else{
+ this.replaceSubjects()
+ }
+ // this.value_for_display=this.displayData.volunteer_info
+ }
+ }
+ }
+ replaceSubjects(){
+ console.log(this.subjectList)
+ this.value_for_display=this.displayData.volunteer_info
+ let alert_value_for_display=this.value_for_display
+ alert_value_for_display.forEach(val=>{
+ let local_val=val
+ local_val.subject=local_val.subject.replace('[','')
+ local_val.subject=local_val.subject.replace(']','')
+ local_val.subject=local_val.subject.replace(/"/g,'')
+ let subject_lis=local_val.subject.split(',')
+ console.log(local_val,subject_lis)
+ let alt_subject:string='';
+ subject_lis.forEach(subject_curr=>{
+ if(subject_curr != '0'){
+ console.log(this.subjectList.filter(subject=>subject.id == subject_curr).map(sub_name=>sub_name.subjects))
+ alt_subject+=', '+this.subjectList.filter(subject=>subject.id == subject_curr).map(sub_name=>sub_name.subjects)[0]
+ }
+ else{
+ alt_subject+=', '+local_val.subject_others
+ }
+ })
+ alt_subject=alt_subject.replace(',','')
+ local_val.subject_names=alt_subject
+ console.log(alt_subject,local_val)
+ val=local_val
+ })
+ this.value_for_display=alert_value_for_display
+ console.log(this.value_for_display)
+ }
+
+}
diff --git a/ng8-seed/src/app/dashboard/charts.data.ts b/ng8-seed/src/app/dashboard/charts.data.ts
old mode 100644
new mode 100755
diff --git a/ng8-seed/src/app/dashboard/dashboard.component.html b/ng8-seed/src/app/dashboard/dashboard.component.html
old mode 100644
new mode 100755
index 128221a..ba70713
--- a/ng8-seed/src/app/dashboard/dashboard.component.html
+++ b/ng8-seed/src/app/dashboard/dashboard.component.html
@@ -83,10 +83,13 @@ showCaptions="true"
-