BBBBAAAAAAMerge branch 'master' of https://bitbucket.org/venbaittech/csr_webapp
This commit is contained in:
venbatechnologies@gmail.com
commit
4ebff2b58b
@ -3,11 +3,11 @@
|
||||
<mat-card class="p-2 main-detail-product">
|
||||
<div fxLayout="row wrap">
|
||||
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="50" fxFlex.xl="30">
|
||||
<h3>Building Fund</h3>
|
||||
<h3>{{schoolInfo.school_name}}</h3>
|
||||
<!-- <a href="#">home </a><a href="#">home</a><mat-icon>arrow_forward</mat-icon><a href="#">home</a> -->
|
||||
<a href="#" style="padding: 3px;font-size:16px;font-style: underline"><span >Home <span style="font-size: 22px;">⇀</span></span></a>
|
||||
<a href="#" style="padding: 3px;font-size:16px;"><span >Project <span style="font-size: 22px;">⇀</span></span></a>
|
||||
<span style="padding: 3px;font-size:16px;">Details</span>
|
||||
<!-- <a href="#" style="padding: 3px;font-size:16px;font-style: underline"><span >Home <span style="font-size: 22px;">⇀</span></span></a>
|
||||
<a href="#" style="padding: 3px;font-size:16px;"><span >School <span style="font-size: 22px;">⇀</span></span></a>
|
||||
<span style="padding: 3px;font-size:16px;">Details</span> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="product-detail" fxLayout="row wrap">
|
||||
@ -32,13 +32,83 @@
|
||||
<div class="column m-gap p-gap product-info" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
|
||||
<div class="">
|
||||
<h2 class="mt-0">{{schoolInfo.school_name}}</h2>
|
||||
<div class="price">
|
||||
<!-- <h2>$120<span class="sale">$129</span></h2> -->
|
||||
<h4 class="mt-0">{{schoolInfo.district_name}}</h4>
|
||||
<!-- <button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button> -->
|
||||
</div>
|
||||
<h4 class="mt-0">{{schoolInfo.block_name}} Block, {{schoolInfo.district_name}} District </h4>
|
||||
<h6 class="mt-0"> {{schoolInfo.management}} - {{schoolInfo.category}} </h6>
|
||||
<hr>
|
||||
<!-- <div class="price">
|
||||
<h2>$120<span class="sale">$129</span></h2>
|
||||
<button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button>
|
||||
</div> -->
|
||||
<div class="separator"></div>
|
||||
<div fxLayout="row wrap">
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0" class="mt-2">
|
||||
<div fxFlex.sm="24.33" fxFlex.xs="100" fxFlex.md="24.33" fxFlex.lg="24.33" fxFlex.xl="24.33" class="m-gap p-gap align-self-center">
|
||||
<h5 class="mt-0">Classes</h5>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<!-- <i class="fa fa-shopping-bag fa-2x align-self-center"></i> -->
|
||||
<div class="temp align-self-center">{{schoolInfo.low_class === '13' ? 'LKG': schoolInfo.low_class === '14' ? 'UKG' : schoolInfo.low_class === '15' ? 'Pre-kg' : schoolInfo.low_class}} - {{schoolInfo.high_class === '13' ? 'LKG': schoolInfo.high_class === '14' ? 'UKG' : schoolInfo.high_class === '15' ? 'Pre-kg' : schoolInfo.high_class}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0">
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap align-self-center">
|
||||
<h5 class="mt-0">Students</h5>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<!-- <i class="fa fa-users fa-2x align-self-center"></i> -->
|
||||
<div class="temp align-self-center"> {{schoolInfo.total}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<i class="fa fa-male fa-2x align-self-center"></i>
|
||||
<div class="temp align-self-center"> {{schoolInfo.total_b}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<i class="fa fa-female fa-2x align-self-center"></i>
|
||||
<div class="temp align-self-center"> {{schoolInfo.total_g}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0">
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap align-self-center">
|
||||
<h5 class="mt-0">Staff</h5>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<!-- <<i class="fa fa-shopping-bag fa-2x align-self-center"></i>> -->
|
||||
<div class="temp align-self-center"> {{schoolInfo.totstaff}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<div class="temp align-self-center"> {{schoolInfo.teach_tot}}</div>
|
||||
</div>
|
||||
<p class="mt-0 mb-0" style="font-size:10px;">Teaching</p>
|
||||
</div>
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<div class="sun d-flex">
|
||||
<div class="temp align-self-center"> {{schoolInfo.nonteach_tot}}</div>
|
||||
</div>
|
||||
<p class="mt-0 mb-0" style="font-size:10px;">Non-Teaching</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0">
|
||||
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxLayoutAlign="center" class="m-gap p-gap">
|
||||
<button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div fxLayout="row wrap">
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" class="m-gap p-gap">
|
||||
<mat-card class="p-1 sch_details">
|
||||
<h6>Total Boys</h6>
|
||||
@ -77,7 +147,7 @@
|
||||
<h2 style="margin-top: 0px !important;">{{schoolInfo.totstaff}}</h2>
|
||||
</mat-card>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- <p>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.</p> -->
|
||||
</div>
|
||||
<!-- <ul class="share-with">
|
||||
@ -91,12 +161,11 @@
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0">
|
||||
<!-- <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="1000" fxFlex.xl="40"> -->
|
||||
<mat-card class="p-2" fxFlex="100%" fxFlex.xs="100" fxFlex.sm="100">
|
||||
<h4>About Project</h4>
|
||||
<h4>Requirements</h4>
|
||||
<mat-tab-group class="mt-2">
|
||||
<mat-tab class="tab-group">
|
||||
<ng-template mat-tab-label>Project Info</ng-template>
|
||||
<ng-template mat-tab-label>Requirement Details</ng-template>
|
||||
<mat-card-content>
|
||||
<p>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.</p>
|
||||
<table style="padding:20px;">
|
||||
<tr>
|
||||
<th>Details</th>
|
||||
@ -113,6 +182,11 @@
|
||||
<td>{{schoolInfo.qty}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0">
|
||||
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxLayoutAlign="end center" class="m-gap p-gap">
|
||||
<button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</mat-card-content>
|
||||
</mat-tab>
|
||||
|
||||
@ -1,6 +1,13 @@
|
||||
mat-card{
|
||||
overflow: visible;
|
||||
}
|
||||
.mat-raised-button{
|
||||
color:#fff;
|
||||
background-color: #51caca;
|
||||
}
|
||||
.temp{
|
||||
font-size: 25px;
|
||||
}
|
||||
.sch_details{
|
||||
height: 65px;
|
||||
color: #fff;
|
||||
@ -89,6 +96,7 @@ td, th {
|
||||
border: 1px solid #dddddd;
|
||||
text-align: left;
|
||||
padding: 1%;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
tr:nth-child(even) {
|
||||
|
||||
@ -3,7 +3,8 @@ import { environment } from 'environments/environment';
|
||||
import { ApiService } from 'app/shared/api.service';
|
||||
import { FormBuilder } from '@angular/forms';
|
||||
import { Router } from '@angular/router';
|
||||
import { SchoolDetailsService } from 'app/shared/school-details.service';
|
||||
import { SchoolDetailsService } from 'app/shared/school-details.service';
|
||||
import { MatDialogRef, MatDialogConfig, MatDialog } from '@angular/material';
|
||||
|
||||
@Component({
|
||||
selector: 'app-project-detail',
|
||||
@ -11,14 +12,14 @@ import { SchoolDetailsService } from 'app/shared/school-details.service';
|
||||
styleUrls: ['./project-detail.component.scss']
|
||||
})
|
||||
export class ProjectDetailComponent implements OnInit {
|
||||
|
||||
@ViewChild('slider',{static:false}) sliderimg
|
||||
imageSources=[];
|
||||
school_list : any [];
|
||||
imageSources=[];
|
||||
|
||||
schoolInfo: any ;
|
||||
schoolInfo: any ;
|
||||
|
||||
// types_of_funds=['State Fund','District Fund','School common Fund','For this Project']
|
||||
constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,public schInfo:SchoolDetailsService) { }
|
||||
constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,public schInfo:SchoolDetailsService,public dialog: MatDialog) { }
|
||||
|
||||
|
||||
ngOnInit() {
|
||||
@ -80,4 +81,7 @@ export class ProjectDetailComponent implements OnInit {
|
||||
this.sliderimg.goToSlide(index);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.md="23.33" fxFlex.lg="23.33" fxFlex.xl="23.33" class="m-gap p-gap" style="margin-left: 5px;" *ngFor="let schooldetails of school_list" (click)="getschDetails(schooldetails)">
|
||||
<div class="p-list-main mb-2">
|
||||
<div class="p-list">
|
||||
<div class="top"><img src="{{schooldetails.images[0]}}" onerror="this.onerror=null;this.src='https://upload.wikimedia.org/wikipedia/commons/thumb/1/15/No_image_available_600_x_450.svg/600px-No_image_available_600_x_450.svg.png';" alt=""></div>
|
||||
<div class="top"><img src="{{schooldetails.images[0]}}" onerror="this.onerror=null;this.src='https://image.shutterstock.com/image-vector/school-boy-standing-his-uniform-260nw-1216095019.jpg';" alt=""></div>
|
||||
<div class="bottom">
|
||||
<div class="left">
|
||||
<div class="details" style="width: unset !important;">
|
||||
|
||||
@ -28,7 +28,9 @@ export class ProjectListComponent implements OnInit {
|
||||
this.restApi.get(url).subscribe(schDet=>
|
||||
{
|
||||
// console.log(schDet);
|
||||
// this.school_list = schDet['records'].filter(sch=>sch.is_featured==this.is_featured)[0];
|
||||
this.school_list = schDet['records'];
|
||||
this.school_list = this.school_list.filter(sch=>sch.is_featured==1);
|
||||
// console.log(this.school_list);
|
||||
|
||||
})
|
||||
@ -48,7 +50,7 @@ export class ProjectListComponent implements OnInit {
|
||||
|
||||
getschDetails(schDetails)
|
||||
{
|
||||
let data = {'school_name':schDetails.school_name,'images':schDetails.images,'district_name':schDetails.district_name,'total_b':schDetails.total_b,'total_g':schDetails.total_g,'total':schDetails.total,'teach_tot':schDetails.teach_tot,'nonteach_tot':schDetails.nonteach_tot,'totstaff':schDetails.totstaff,'total_cost':schDetails.total_cost,'total_recevied':schDetails.total_recevied,'school_id':schDetails.school_id};
|
||||
let data = {'school_name':schDetails.school_name,'images':schDetails.images,'district_name':schDetails.district_name,'total_b':schDetails.total_b,'total_g':schDetails.total_g,'total':schDetails.total,'teach_tot':schDetails.teach_tot,'nonteach_tot':schDetails.nonteach_tot,'totstaff':schDetails.totstaff,'total_cost':schDetails.total_cost,'total_recevied':schDetails.total_recevied,'school_id':schDetails.school_id,'block_name':schDetails.block_name,'management':schDetails.management,'category':schDetails.category,'high_class':schDetails.high_class,'low_class':schDetails.low_class,'latitude':schDetails.longitude,'longitude':schDetails.longitude};
|
||||
|
||||
this.schInfo.updateDetails(data);
|
||||
this.router.navigate(['/home/project-detail']);
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<input matInput placeholder="Password" type="password" name="password" required formControlName="password">
|
||||
</mat-form-field>
|
||||
<button class="mat-green" mat-raised-button (click)="csrUserLogin()">SIGN IN</button>
|
||||
<p class="mat-text-warn mb-0">Forgot password?</p>
|
||||
<!-- <p class="mat-text-warn mb-0">Forgot password?</p> -->
|
||||
<p class="mb-0">Don't have an account? <a [routerLink]="['../register']" class="mat-text-primary">Register Here</a></p>
|
||||
</div>
|
||||
<!-- <div>
|
||||
|
||||
@ -33,16 +33,31 @@
|
||||
|
||||
</div>
|
||||
<hr>
|
||||
<div class="mt-1 mb-1">
|
||||
<label class="mr-1">Registering as on Organisation ?</label>
|
||||
<mat-slide-toggle name="slideToggle" required (change)="change_fun($event)">
|
||||
</mat-slide-toggle>
|
||||
{{slidetoggle}}
|
||||
</div>
|
||||
<div fxLayout="column" fxLayoutAlign="start stretch" formGroupName="org_info">
|
||||
<mat-form-field style="width: 100%">
|
||||
<div *ngIf="slide1">
|
||||
<mat-form-field style="width: 100%">
|
||||
<input matInput placeholder="Organisation Name" type="text" name="orgname" formControlName="orgname" required>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width: 100%;">
|
||||
<textarea matInput placeholder="Register Address" name="org_address" formControlName="org_address" required></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="mt-1 mb-1">
|
||||
<label class="mr-1">Do you want to avail 80G Exemption</label>
|
||||
<mat-slide-toggle name="slideToggle" (change)="change_fun2($event)" required>
|
||||
</mat-slide-toggle>
|
||||
</div>
|
||||
<div *ngIf="slide2">
|
||||
<mat-form-field style="width: 100%">
|
||||
<input matInput placeholder="Pan of the Organisation" type="number" name="org_pan" formControlName="org_pan" required>
|
||||
</mat-form-field>
|
||||
<input matInput placeholder="PAN of the Organisation" type="number" name="org_pan" formControlName="org_pan" required>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<button class="mat-red" mat-raised-button (click)="csrUserRegistration()">Register</button>
|
||||
</div>
|
||||
<!-- <div>
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
import { Component, OnInit,ViewEncapsulation } from '@angular/core';
|
||||
import { Component, OnInit,ViewEncapsulation, ViewChild } 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 { values } from 'd3';
|
||||
|
||||
@Component({
|
||||
selector: 'ms-register-session',
|
||||
@ -17,7 +18,9 @@ export class RegisterComponent {
|
||||
password: string;
|
||||
passwordConfirm: string;
|
||||
go_reg: any;
|
||||
|
||||
slide1:boolean=false
|
||||
slide2:boolean=false
|
||||
@ViewChild('slideToggle',{static:false}) slidetoggle
|
||||
constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router) { }
|
||||
|
||||
ngOnInit() {
|
||||
@ -35,16 +38,40 @@ export class RegisterComponent {
|
||||
email: new FormControl(''),
|
||||
mobile: new FormControl(''),
|
||||
password: new FormControl(''),
|
||||
user_type: new FormControl(''),
|
||||
org_info: this.fb.group({
|
||||
orgname: new FormControl(''),
|
||||
org_address: new FormControl(''),
|
||||
org_pan: new FormControl('')
|
||||
org_pan: new FormControl(''),
|
||||
org_other_details: new FormControl(''),
|
||||
user_id: new FormControl(''),
|
||||
isactive: new FormControl(''),
|
||||
|
||||
}),
|
||||
"created_by":"1",
|
||||
"updated_by":"1"
|
||||
|
||||
})
|
||||
}
|
||||
change_fun(value){
|
||||
console.log(value)
|
||||
if(value.checked == true){
|
||||
this.slide1=true
|
||||
}
|
||||
else{
|
||||
this.slide1=false
|
||||
}
|
||||
}
|
||||
|
||||
change_fun2(value){
|
||||
console.log(value)
|
||||
if(value.checked == true){
|
||||
this.slide2=true
|
||||
}
|
||||
else{
|
||||
this.slide2=false
|
||||
}
|
||||
}
|
||||
|
||||
csrUserRegistration()
|
||||
{
|
||||
|
||||
@ -7,7 +7,8 @@ import {
|
||||
MatRadioModule,
|
||||
MatButtonModule,
|
||||
MatProgressBarModule,
|
||||
MatToolbarModule } from '@angular/material';
|
||||
MatToolbarModule,
|
||||
MatSlideToggleModule} from '@angular/material';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { MatIconModule} from '@angular/material';
|
||||
import { FlexLayoutModule } from '@angular/flex-layout';
|
||||
@ -30,6 +31,7 @@ import { SessionRoutes } from './session.routing';
|
||||
MatRadioModule,
|
||||
MatButtonModule,
|
||||
ReactiveFormsModule,
|
||||
MatSlideToggleModule,
|
||||
MatProgressBarModule,
|
||||
MatToolbarModule,
|
||||
FlexLayoutModule
|
||||
|
||||
@ -5,7 +5,7 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
|
||||
})
|
||||
export class SchoolDetailsService {
|
||||
|
||||
public SchoolDetails = new BehaviorSubject<any>({'school_name':'','images':'','district_name':'','total_b':'','total_g':'','total':'','teach_tot':'','nonteach_tot':'','totstaff':'','total_cost':'','total_recevied':'','school_id':''});
|
||||
public SchoolDetails = new BehaviorSubject<any>({'school_name':'','images':'','district_name':'','total_b':'','total_g':'','total':'','teach_tot':'','nonteach_tot':'','totstaff':'','total_cost':'','total_recevied':'','school_id':'','block_name':'','category':'','management':'','latitude':'','longitude':'','high_class':'','low_class':''});
|
||||
|
||||
constructor() { }
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user