bitbucket-pipelines.yml

@@ -1,37 +0,0 @@
-# This is a sample build configuration for JavaScript.
-# Check our guides at https://confluence.atlassian.com/x/14UWN for more examples.
-# Only use spaces to indent your .yml configuration.
-# -----
-# You can specify a custom docker image from Docker Hub as your build environment.
-image: node:10.15.3
-
-pipelines:
-   branches:
-       master:
-        - step:
-            caches:
-             - node
-            script: # Modify the commands below to build your repository.
-            - npm install
-            - npm install -g @angular/cli
-            - ng build
-            - ls -ltr
-            - cd dist
-            - echo "Number of files in dist"
-            - ls -l . | egrep -c '^-'
-            - pipe: atlassian/aws-s3-deploy:0.3.8
-              variables:
-                AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
-                AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
-                AWS_DEFAULT_REGION: 'ap-south-1'
-                S3_BUCKET:  'autodeploy001'
-                LOCAL_PATH: $(pwd)
-                # CONTENT_ENCODING: '<string>' # Optional.
-                # ACL: '<string>' # Optional.
-                # STORAGE_CLASS: '<string>' # Optional.
-                # CACHE_CONTROL: '<string>' # Optional.
-                # EXPIRES: '<timestamp>' # Optional.
-                # DELETE_FLAG: '<boolean>' # Optional.
-                # EXTRA_ARGS: '<string>' # Optional.
-                # DEBUG: '<boolean>' # Optional.
-

ng8-seed/package.json

@@ -12,22 +12,22 @@
   },
   "private": true,
   "dependencies": {
-    "@agm/core": "^1.1.0",
+    "@agm/core": "^1.0.0-beta.5",
-    "@angular/animations": "^8.2.14",
+    "@angular/animations": "^8.2.2",
     "@angular/cdk": "^7.3.7",
-    "@angular/common": "^8.2.14",
+    "@angular/common": "^8.2.2",
-    "@angular/compiler": "^8.2.14",
+    "@angular/compiler": "^8.2.2",
-    "@angular/core": "^8.2.14",
+    "@angular/core": "^8.2.2",
     "@angular/flex-layout": "7.0.0-beta.19",
-    "@angular/forms": "^8.2.14",
+    "@angular/forms": "^8.2.2",
     "@angular/material": "^7.0.3",
-    "@angular/platform-browser": "^8.2.14",
+    "@angular/platform-browser": "^8.2.2",
-    "@angular/platform-browser-dynamic": "^8.2.14",
+    "@angular/platform-browser-dynamic": "^8.2.2",
-    "@angular/router": "^8.2.14",
+    "@angular/router": "^8.2.2",
     "@fortawesome/angular-fontawesome": "^0.5.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.26",
+    "@fortawesome/fontawesome-svg-core": "^1.2.25",
-    "@fortawesome/free-brands-svg-icons": "^5.12.0",
+    "@fortawesome/free-brands-svg-icons": "^5.11.2",
-    "@fortawesome/free-solid-svg-icons": "^5.12.0",
+    "@fortawesome/free-solid-svg-icons": "^5.11.2",
     "@ngx-share/button": "^7.1.4",
     "@ngx-share/buttons": "^7.1.4",
     "@ngx-share/core": "^7.1.4",
@@ -38,9 +38,9 @@
     "angular-notifier": "^6.0.1",
     "angular-socialshare": "^2.3.11",
     "angular-sortablejs": "^2.6.0",
-    "angular-tree-component": "^8.5.2",
+    "angular-tree-component": "^8.4.0",
-    "chart.js": "^2.9.3",
+    "chart.js": "^2.7.3",
-    "core-js": "^2.6.11",
+    "core-js": "^2.5.7",
     "d3": "^4.9.1",
     "date-fns": "^1.29.0",
     "dragula": "^3.7.2",
@@ -49,56 +49,54 @@
     "html2canvas": "^1.0.0-rc.5",
     "jquery": "^3.4.1",
     "jspdf": "^1.5.3",
-    "leaflet": "^1.6.0",
+    "leaflet": "^1.3.4",
     "leaflet-map": "^0.2.1",
     "moment": "^2.22.2",
     "ng-pick-datetime": "^7.0.0",
     "ng-simple-slideshow": "^1.2.9",
     "ng2-charts": "^1.6.0",
     "ng2-dragula": "^2.1.1",
-    "ng2-file-upload": "^1.4.0",
+    "ng2-file-upload": "^1.3.0",
     "ng2-tree": "^2.0.0-alpha.10",
     "ng2-validation": "^4.2.0",
     "ngx-color-picker": "^7.0.2",
-    "ngx-cookie-service": "^2.3.0",
+    "ngx-cookie-service": "^2.2.0",
-    "ngx-mat-select-search": "^2.1.0",
     "ngx-perfect-scrollbar": "5.0.0-7",
-    "ngx-slick-carousel": "^0.4.7",
+    "ngx-slick-carousel": "^0.4.6",
     "ngx-social-button": "^1.0.4",
-    "ngx-spinner": "^8.1.0",
     "perfect-scrollbar": "^1.4.0",
-    "quill": "^1.3.6",
+    "quill": "^1.3.7",
-    "rxjs": "^6.5.4",
+    "rxjs": "^6.3.3",
-    "rxjs-compat": "^6.5.4",
+    "rxjs-compat": "^6.3.3",
     "screenfull": "^3.3.3",
     "simple-line-icons": "^2.4.1",
     "slick-carousel": "^1.8.1",
-    "sortablejs": "^1.10.2",
+    "sortablejs": "^1.7.0",
     "tether": "^1.4.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.802.2",
+    "@angular-devkit/build-angular": "^0.803.22",
     "@angular/cli": "^8.3.20",
-    "@angular/compiler-cli": "^8.2.14",
+    "@angular/compiler-cli": "^8.2.2",
-    "@angular/language-service": "^8.2.14",
+    "@angular/language-service": "^8.2.2",
     "@types/d3": "^3.5.41",
     "@types/jasmine": "^2.8.11",
     "@types/jquery": "^3.3.22",
-    "@types/node": "^10.17.13",
+    "@types/node": "^10.12.6",
     "@types/nvd3": "^1.8.39",
-    "codelyzer": "^5.2.1",
+    "codelyzer": "^5.0.1",
-    "jasmine-core": "^3.5.0",
+    "jasmine-core": "^3.3.0",
     "jasmine-spec-reporter": "^4.2.1",
-    "karma": "^4.4.1",
+    "karma": "^4.2.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
-    "karma-coverage-istanbul-reporter": "^2.1.1",
+    "karma-coverage-istanbul-reporter": "^2.0.4",
     "karma-jasmine": "^1.1.2",
-    "karma-jasmine-html-reporter": "^1.5.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "protractor": "^5.4.1",
     "ts-node": "^7.0.1",
-    "tslint": "^5.20.1",
+    "tslint": "^5.11.0",
     "typescript": "3.5.3"
   }
 }

ng8-seed/src/app/app.module.ts

@@ -48,7 +48,7 @@ import { PaymentConfirmationComponent } from './components/payment-confirmation/
 import { MyAccountComponent } from './components/my-account/my-account.component';
 import { TokenInterceptorService } from './shared/guards/token-interceptor.service';
 import { AuthGuardService } from './shared/guards/auth-guard.service';
-import { MatTableDataSource, MatTableModule, MatSlideToggleModule, MatRadioModule, MatButtonModule, MatBottomSheetModule, MatDialogModule } from '@angular/material';
+import { MatTableDataSource, MatTableModule, MatSlideToggleModule, MatRadioModule, MatButtonModule, MatBottomSheetModule } from '@angular/material';
 import { SchoolDetailsService } from './shared/school-details.service';
 // import { AddEventModule } from './add-event.module';
 import {HashLocationStrategy,LocationStrategy,PathLocationStrategy} from '@angular/common';
@@ -74,10 +74,6 @@ import { EditUserDetailsComponent } from 'app/edit-user-details/edit-user-detail
 import { ConfirmationDialogComponent } from './common/confirmation-dialog/confirmation-dialog.component';
 import { VolunteerInfoComponent } from './components/user-profile/volunteer-info/volunteer-info.component';
 import { BottomSheetComponent } from './common/bottom-sheet/bottom-sheet.component';
-import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'
-import { ContributeFundComponent } from './components/contribute/contribute-fund/contribute-fund.component';
-import { NgxSpinnerModule } from "ngx-spinner";
-import { ContactComponent } from './components/contact/contact.component';
 // import { ArticleShrinkComponent } from './knowledge-sharing/article-shrink/article-shrink.component';
 
 export function HttpLoaderFactory(http: HttpClient) {
@@ -123,9 +119,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     userCertificateDisplay,
     EditUserDetailsComponent,
     VolunteerInfoComponent,
-    BottomSheetComponent,
+    BottomSheetComponent
-    ContributeFundComponent,
-    ContactComponent
     
     
     // ProjectListComponent
@@ -153,9 +147,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     MatTableModule,
     DemoMaterialModule,
     HttpClientModule,
-    MatDialogModule,
-    NgxMatSelectSearchModule,
-    NgxSpinnerModule,
     TranslateModule.forRoot({
         loader: {
             provide: TranslateLoader,
@@ -198,7 +189,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
       useFactory: getAuthServiceConfigs
   },
   ],
-  entryComponents: [PasswordChangeComponent,ContributeFundComponent,UserCertificateComponent,EditUserDetailsComponent,BottomSheetComponent],
+  entryComponents: [PasswordChangeComponent,UserCertificateComponent,EditUserDetailsComponent,BottomSheetComponent],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

ng8-seed/src/app/app.routing.ts

@@ -17,7 +17,6 @@ import { SuccessComponent } from './components/payment-status/success/success.co
 import { FailureComponent } from './components/payment-status/failure/failure.component';
 import { UserCertificateComponent, userCertificateDisplay } from './components/user-certificate/user-certificate.component';
 import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { ContactComponent } from './components/contact/contact.component';
 export const AppRoutes: Routes = [{
   path: '',
   redirectTo: 'home',
@@ -83,10 +82,6 @@ export const AppRoutes: Routes = [{
   {
     path:'privacy-policy',
     component:PrivacyPolicyComponent
-  },
-  {
-    path:'contact',
-    component:ContactComponent
   },{
     path:'knowledge-sharing',
     loadChildren:'./knowledge-sharing/knowledge-sharing.module#KnowledgeSharingModule'

ng8-seed/src/app/components/contribute/contribute.component.html

@@ -0,0 +1,223 @@
+<div id="top"></div>
+  <!--starts-->
+  <div fxLayout fxLayout="row"  fxLayout.xs="column"  >
+    <!-- <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="1000" fxFlex.xl="40"> -->
+<mat-card class="p-2" fxFlex.lg="72.5%" fxFlex.xs="100" fxFlex.sm="70%" fxFlex.md="68%"  fxFlex.xl="70%">
+        <mat-card-title class="mb-1"><h5 class="mt-0 text-center">Contribute to Specific Need </h5></mat-card-title>
+        <hr>
+         <form [formGroup]="Contribute">
+              <div fxLayout="row" fxLayout.sm="column" fxLayoutAlign="start center" class="mb-2 pt-1" >
+<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 40%;">
+<mat-select placeholder="Select District" formControlName="district_id" (selectionChange)="getFilterValue($event.value,'school')">
+        <mat-option *ngFor="let item of district" [value]="item.district_id" >
+            {{ item.district_name }}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
+<mat-form-field dividerColor="accent" class="ml-xs mr-xs" style="width: 100%;"  fxFlex.xs="50">
+<mat-select placeholder="Select School" formControlName="schoold_id">
+        <mat-option *ngFor="let item of school" [value]="item.school_id" >
+            {{ item.school_name }}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
+</div> 
+<div fxLayout="row"  fxLayout.xs="column">
+<mat-form-field dividerColor="warn" class="ml-xs mr-xs" style="width: 100%;">
+<mat-select placeholder="Select Category" formControlName="cad_id" (selectionChange)="getFilterValue($event.value,'material')">
+        <mat-option *ngFor="let item of category" [value]="item.cat_id" >
+            {{ item.cat_name }}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
+<mat-form-field dividerColor="warn" class="ml-xs mr-xs" style="width: 100%;">
+<mat-select placeholder="Material Name" formControlName="mat_id">
+        <mat-option *ngFor="let item of material_category.materials" [value]="item.mat_id" >
+            {{ item.material_name }}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
+</div>
+<div fxLayout fxLayout="row" style="text-align: right;" class="mb-2">
+    <div class="" fxFlex="100%" fxFlex.xs="100" fxFlex.sm="100">
+        <button  mat-raised-button color="primary" (click)="refresh()">View All</button>
+        <button class="ml-2" mat-raised-button color="primary" (click)="reset()">Clear</button>
+       <button class="ml-2" mat-raised-button color="primary" (click)="getSchoolReqList()">Submit</button>
+    </div>    
+    </div>
+</form>
+
+    <!--*********************--> 
+    <!-- [ngClass]="{'example-container mat-elevation-z8':clientWidth >= 500}" -->
+      <div  #table_element>
+        <mat-table [dataSource]="dataSource" matSort *ngIf="dataStatus;else status">
+      
+          <!-- Requirement Column -->
+          <!-- <ng-container matColumnDef="Requirement">
+            <th style="width: 15% !important;" mat-header-cell *matHeaderCellDef ></th>
+            <td style="width: 15% !important;" mat-cell *matCellDef="let row" class="product-thumbnail"><img src="{{row.img_url}}" onerror="this.onerror=null;this.src='assets/images/csr-img/error_img.jpg';" alt="School Img" width="70"></td>
+          </ng-container> -->
+
+          <!-- Item Need Column -->
+          <ng-container matColumnDef="Item_Need">
+            <mat-header-cell  *matHeaderCellDef mat-sort-header>Item Needed</mat-header-cell>
+            <mat-cell  *matCellDef="let row" data-label="Item Needed" class="product-thumbnail"><span> {{row.material_name}} </span></mat-cell>
+          </ng-container>
+
+          <!-- School Column -->
+          <ng-container matColumnDef="School">
+            <mat-header-cell   *matHeaderCellDef  mat-sort-header>School</mat-header-cell>
+            <mat-cell    data-label="School" *matCellDef="let row"><span> <a (click)="goToProjectDet(row)">{{row.school_name}}</a>,<br/> {{row.block_name}} Block, {{row.district_name}} District.</span></mat-cell>
+          </ng-container>
+      
+          <!-- Quantity Column -->
+          <ng-container matColumnDef="Required_Qty">
+            <mat-header-cell  *matHeaderCellDef mat-sort-header> Required Qty </mat-header-cell>
+            <mat-cell   data-label="Required Qty" *matCellDef="let row"> {{row.qty}}</mat-cell>
+          </ng-container>
+
+          <ng-container matColumnDef="Received_Qty">
+              <mat-header-cell   *matHeaderCellDef > Received Qty </mat-header-cell>
+              <mat-cell  data-label="Received Qty"  *matCellDef="let row"> {{row.received_qty}}</mat-cell>
+            </ng-container>
+            <ng-container matColumnDef="balance_Qty">
+                <mat-header-cell   *matHeaderCellDef > Balance Qty </mat-header-cell>
+                <mat-cell data-label="balance Qty"  *matCellDef="let row"> {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }}</mat-cell>
+              </ng-container>
+      
+          <!-- Sponsor Column -->
+          <ng-container matColumnDef="Sponsor_Qty">
+            <mat-header-cell   *matHeaderCellDef > Sponsored Qty </mat-header-cell>
+            <mat-cell  data-label="Sponsored Qty" *matCellDef="let row;let i = index"> <input  OnlyNumber="true"  step="1" min="1" max="" title="Qty" [(ngModel)]="sponsor_qty[i]" class="text" size="2" type="number" (change)="somethingChanged($event.target.value,i,row.cost_per_unit,row.mat_id,row)" 
+            class="sponsor_input" > </mat-cell>
+          </ng-container>
+         
+          <!-- price Column -->
+          <ng-container matColumnDef="Cost_Per_Unit">
+            <mat-header-cell   *matHeaderCellDef  > Cost Per Unit<br> (in Rs) </mat-header-cell>
+            <mat-cell data-label="Cost/Qty" style="text-align: right;" *matCellDef="let row;" > {{row.cost_per_unit === null?0:row.cost_per_unit}} </mat-cell>
+            <!-- <td mat-footer-cell *matFooterCellDef> Total </td> -->
+          </ng-container>
+      
+          <!-- Total Column -->
+          <ng-container matColumnDef="Amount">
+            <mat-header-cell  *matHeaderCellDef  > Amount <br/>(in Rs) </mat-header-cell>
+            <mat-cell data-label="Amount"  *matCellDef="let row ;let i=index" >{{Total[i]}} </mat-cell>
+            <!-- <td mat-footer-cell *matFooterCellDef> {{somethingChanged()}} </td> -->
+          </ng-container>
+       
+          <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+          <mat-row mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+          <!-- <tr mat-footer-row *matFooterRowDef="tableColumns"></tr> -->
+        </mat-table> 
+        <div class="clearfix order-total" style="padding-bottom: 0px !important;">
+                <div class="calculated-shipping" style="text-align: -webkit-right !important;">
+        <table class="table-responsive" cellspacing="0" style="width: 50% !important;" *ngIf="dataStatus"> 
+                <tr class="order-total" style="text-align: right;">
+                    <td style="font-weight: bold;text-align: right">Total</td>
+                        <td> <strong><span class="amount"><span class="currency-symbol">&#8377;</span>{{grandTotal}}</span></strong></td> 
+                </tr>
+            </table>
+            </div>
+            </div> 
+        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons ></mat-paginator>
+        <div  style="text-align: center;"  *ngIf="dataStatus" fxLayoutAlign="center">
+         <mat-label  style=" font-size: 1.25rem;">I am happy to contribute</mat-label>&nbsp;&nbsp;
+          <mat-radio-group [(ngModel)]="contribute_type" >&nbsp;&nbsp;&nbsp;
+            <mat-radio-button  value="2" ><span  style=" font-size: 1.25rem;">Material</span></mat-radio-button><br/>
+            <mat-radio-button value="1"><span  style=" font-size: 1.25rem;">Funds</span></mat-radio-button>
+          </mat-radio-group><br/>
+          <!-- <mat-form-field appearance="outline"  fxFlex="50" fxFlex.xs="100" class="select_cot_type">
+              <mat-label  style=" font-size: 1.25rem;">I am happy to contribute</mat-label>
+          <mat-select color="secondary" placeholder="Select" [(ngModel)]="contribute_type"  #username="ngModel">
+            <mat-option value="2"><span  style=" font-size: 1.25rem;">Materials</span></mat-option>
+            <mat-option value="1"><span  style=" font-size: 1.25rem;">Funds/Money</span></mat-option>
+          </mat-select>
+          <mat-error  *ngIf="username.invalid && username.errors.required && (username.dirty || username.touched)">Contribute type is required</mat-error>
+        </mat-form-field> -->
+        </div>
+        <div class="pt-1 pr-1" style="text-align: right;" *ngIf="dataStatus">
+         
+         
+        <!-- <button mat-raised-button color="primary" (click)="finalSave(2)" class="mr-1 mb-1">I'd like to Contribute in Kind</button> -->
+        <button (click)="finalSave(contribute_type)" mat-raised-button style="background-color:rgb(69, 189, 189);color:white;font-weight: bold" >Submit</button>
+          </div> 
+    </div>
+    <ng-template #status><h2>{{msg}}</h2></ng-template>
+    
+    <!--*********************--> 
+    <!-- <div class="clearfix order-total">
+            <div class="calculated-shipping">
+                <h4>Cart Totals</h4>
+                <table class="table-responsive" cellspacing="0"> 
+                    <tr class="order-total">
+                        <th>Total</th>
+                        <td><strong><span class="amount"><span class="currency-symbol">&#8377;</span>{{somethingChanged()}}</span></strong> </td>
+                    </tr>
+                </table>
+                <div class="order-checkout">
+                        <button mat-raised-button color="primary" class="mr-1 mb-1">Will Contribute the above in kind</button>
+                        <button [routerLink]="['../payment']" mat-raised-button style="background-color:rgb(69, 189, 189);color:white" >Proceed for Payment</button>
+                </div>
+            </div>
+        </div> -->
+</mat-card>
+
+<!-- <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="20" fxFlex.xl="40"> -->
+<mat-card class="support_mat sidescroll" fxFlex="27%" fxFlex.xs="25%" fxFlex.sm="25%">
+  
+    <!-- <mat-card-header  style="padding: 0;margin: 0;"> -->
+        <!-- <mat-card-title> -->
+          
+       <!--</mat-card-title> --> 
+    <!-- </mat-card-header> -->
+    <mat-card-content>
+        <p class="quote" style="margin-top:4px;text-align: center">&#8221;Alone we can do so little,<br> together we can do so much&#8221; <br/>- Hellen Keller</p>
+        <h5 class="text-center"> Contribute to<br> State School Development Fund</h5>
+            <div fxLayout="column" fxLayoutAlign="start stretch">
+
+                    <!-- <div fxLayout fxLayout="row"  fxLayout.xs="column"  fxLayoutGap.xs="0">  -->
+                        <div class="text-center" fxFlex="100%" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="100" fxFlex.xl="100">
+                                <mat-form-field appearance="outline" style="width: 70%;text-align: center;">
+                                        <input matInput type="tel"  OnlyNumber="true" placeholder="Amount in Rs." [(ngModel)]="general_devlop_amt"  maxlength="10" (change)="dev_fund_change($event.target.value)" onkeypress="return event.charCode >= 48 && event.charCode <= 57">
+                                     </mat-form-field>
+                            <!-- </div> -->
+                            </div>
+                     <!-- <mat-radio-button name="group1" class="pb-1" checked>State School Development Fund</mat-radio-button>  -->
+                    <!--<mat-radio-button name="group1">District School Development Fund</mat-radio-button>
+                    <mat-form-field style="width: 100%" class="pl-1">
+                            <mat-select placeholder="Select District"  >
+                                    <mat-option>
+                                       
+                                    </mat-option>
+                                </mat-select>
+                    </mat-form-field> 
+                    <mat-radio-button name="group1">School Development Fund</mat-radio-button> 
+                    <mat-form-field style="width: 100%" class="pl-1">
+                            <mat-select placeholder="Select District"  >
+                                    <mat-option  >
+                                        
+                                    </mat-option>
+                                </mat-select>
+                    </mat-form-field> 
+                    <mat-form-field style="width: 100%" class="pl-1">
+                            <mat-select placeholder="Select School">
+                                    <mat-option >
+                                        
+                                    </mat-option>
+                                </mat-select>
+                    </mat-form-field>   -->
+                    <mat-form-field dividerColor="warn" class="ml-xs mr-xs" style="width: 100%;" appearance="outline">
+                            <textarea matInput placeholder="Comments" rows="5" [(ngModel)]="gen_dev_fund_remarks"></textarea>
+                          </mat-form-field>  
+                    <button mat-raised-button style="background-color:rgb(69, 189, 189);color:white" (click)="storeData_session()">Proceed to Contribute</button>                      
+                    <p class="quote">&#8221;We make a living by what we get.<br> But we make a life by what we give&#8221; <br/>- Winston Churchill</p>
+                </div>
+    </mat-card-content>
+</mat-card>
+<!-- </div> --> 
+<!-- </div> -->
+</div>
+<footer class="footer">
+  <h5>&#9400; TN Schools, All rights reserved &nbsp;&nbsp;|<span class="footer-web"><a class="footer-privacy" href="#/privacy-policy" target="_blank">Privacy Policy</a></span></h5>
+ </footer>

ng8-seed/src/app/components/contribute/contribute.component.scss

@@ -1,125 +1,19 @@
 .calculated-shipping[_ngcontent-gen-c13]{
     padding: 0px !important;
 }
-.large_view_top{
-    margin-top:70px;
-}
-.largefont{
-    font-size: 1.25rem;
-  }
-.text { 
-    width: 100px;
-    transition: all 0.5s;
-    cursor: pointer;
-  }
-  .text span {
-    cursor: pointer;
-    display: inline-block;
-    position: relative;
-    transition: 0.5s;
-  }
-  
-  .text span:after {
-    content: '\00bb';
-    position: absolute;
-    opacity: 0;
-    top: 0;
-    right: -20px;
-    transition: 0.5s;
-  }
-  
-  .text:hover span {
-    padding-right: 25px;
-  }
-  
-  .text:hover span:after {
-    opacity: 1;
-    right: 0;
-  }
 .sidescroll{
     // right: 45px !important;  
-    // height: fit-content;
+    height: fit-content;
     // position: fixed; 
-    // z-index: 0; 
+    z-index: 0;
-        width: 97%;
-        position: fixed;
-        z-index: 2;
-        top: 84px;
-        bottom: auto;
-        background-color: #f1605e3b;
-        // box-shadow: 0 0 5px 1px rgba(0,0,0,.1); 
 }
-.total_card_1{
+@media(max-width:580px){
-    background-color: #f1605e;
+    .sidescroll{
-    padding: 10px 0px 10px 10px;
+    height: auto;
-    border-radius: 10px 0px 0px 10px;
+    position: unset;
-}
+    // right: -20px;
-.total_card_2{
-    background-color: #f1605e;
-    padding: 10px 10px 10px 2px;
-    border-radius: 0px 10px 10px 0px;
-}
-.box_card{
-    height: 130px;    
-    color: #fff;
-    border-radius: 10px;    
-}
-.card_1{
-    background-color:#4caf50bf;
-}
-.card_2{
-    background-color:#ffa500d9;    
-}
-.card_3{
-    background-color:#f44336ba;
-}
-.card_4{
-    background-color:#5ca6b0;
-}
-@media only screen and (min-width:960px){
-mat-header-row{
 
-    background-color: #f8f4f4;
-}
-mat-row{
-    padding: 5px !important;
-    // margin-bottom: 1rem !important;
-    // height: 80px !important;
-    // margin-top: 1rem !important;
-        // border: 1px solid #d4bbbb !important;
-    // background-color: #f8f4f4;
-    // transition: transform 1.5s;
-}
-// mat-row:hover::after, mat-row:focus::after {
-//     opacity: 1;
-//   }
-// mat-row:hover, mat-row:focus {
-//     // transform: scale3d(1.300, 1.300, 1);
-//     border-radius: 5px;
-//     box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
-//   }
-}
-  @media only screen and(max-width:580px){
-    //   .mobileview{
-    //     margin-top: 106px;
-    //   }
-      .mobfont{
-        font-size: 12px;
     }
-      .large_view_top{
-        margin-top:130px;
-    }
-
-  .mob_submit{
-    line-height: 30px;
-    padding: 0px;
-  }
-    // .sidescroll{
-    // height: auto;
-    // position: unset;
-    // // right: -20px;
-
-    // }
 }
 a {
     text-decoration: underline;
@@ -182,7 +76,7 @@ a {
     .mat-table .mat-header-cell, mat-cell {
         border: none;
         // border-bottom: 1px solid #e9e9e9;
-        // padding: 12px 16px 12px 0;
+        padding: 12px 16px 12px 0;
         vertical-align: middle;
 
     }
@@ -208,13 +102,13 @@ a {
         }
       
     }
-    @media only screen and (max-width:768px) {
+    @media(max-width:768px) {
         .main-detail-product {
             padding: 0.3rem !important;
         }
         
     }
-    @media only screen and (max-width:580px){
+    @media(max-width:580px){
       .product-thumbnail {
       display: none;
     }
@@ -273,15 +167,7 @@ a {
     text-align: center;
     font-style: italic;
 }
-@media (max-width: 992px) {
+
-    .container {
-        display: flex;
-        flex-wrap: nowrap;
-        height: 300px;
-        overflow-x: auto;
-        width: auto;
-    }
-  }
 @media screen and (max-width: 960px) {
     .mat-table {
       border: 0;
@@ -373,7 +259,7 @@ a {
     width: 100% ;
     text-align: center;
 }
-@media only screen and (max-width:580px){
+@media(max-width:580px){
 .sponsor_input{
     width:30%;
     text-align: left;

ng8-seed/src/app/components/contribute/contribute.component.ts

@@ -2,13 +2,9 @@ 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';
-import { MatTableDataSource, MatPaginator, MatSort, MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
 import { Router } from '@angular/router';
 import { SchoolDetailsService } from 'app/shared/school-details.service';
-import { ContributeFundComponent } from './contribute-fund/contribute-fund.component';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
-import { NgxSpinnerService } from 'ngx-spinner';
 
 
 
@@ -48,12 +44,7 @@ export class ContributeComponent implements OnInit {
   @ViewChild('table_element',{static:true}) table_element : ElementRef
   clientWidth: any;
   contribute_type:any='';
-  districtData: any = [];
+  constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService,public schInfo:SchoolDetailsService) {
-  protected _onDestroy = new Subject<void>();
-  schoolData: any = [];
-  categoryData: any = [];
-  materialsData: any = [];
-  constructor(private spinner: NgxSpinnerService,public dialog: MatDialog,public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService,public schInfo:SchoolDetailsService) {
      // Create 100 users
    
    }
@@ -99,11 +90,7 @@ export class ContributeComponent implements OnInit {
         schoold_id: new FormControl(''),
         district_id: new FormControl(''),
         cad_id: new FormControl(''),
-        mat_id: new FormControl(''),
+        mat_id: new FormControl('')
-        districtSearch: new FormControl(''),
-        schoolSearch: new FormControl(''),
-        categorySearch: new FormControl(''),
-        materialsSearch: new FormControl('')
       })
   }
   getFilterValue(value,option){
@@ -118,7 +105,6 @@ export class ContributeComponent implements OnInit {
                 if(res['dataStatus'])
                 {
                   this.district = res['records'].filter(val=>val.district_name != null);
-                  this.districtData = this.district;
                 }
             })
         break;
@@ -130,7 +116,6 @@ export class ContributeComponent implements OnInit {
                 if(res['dataStatus'])
                 {
                   this.school = res['records'];
-                  this.schoolData = this.school;
                 }
             })
           
@@ -142,7 +127,6 @@ export class ContributeComponent implements OnInit {
                   if(res['dataStatus'])
                   {
                     this.category = res['records'].filter(val=>val.cat_name != null);
-                    this.categoryData = this.category;  
                   }
               })
         break;
@@ -150,7 +134,6 @@ export class ContributeComponent implements OnInit {
         
               this.material_category = this.category.filter(cate=>cate.cat_id==value)[0];
               console.log(this.material_category);
-              this.materialsData = this.material_category.materials;
         break;
       }
       
@@ -158,8 +141,6 @@ export class ContributeComponent implements OnInit {
 
   getSchoolReqList()
   {
-    this.spinner.show();
-
     this.finalData=[]
     this.whole_contribute_list=[]
     this.Total=[]
@@ -213,10 +194,6 @@ export class ContributeComponent implements OnInit {
           this.pageSize = 0;
           this.msg = schDet.msg;
         }
-        setTimeout(() => {
-          /** spinner ends after 5 seconds */
-          this.spinner.hide();
-        });
     })
   }
   somethingChanged(e,i,item,mat_id,curr_data){
@@ -296,14 +273,14 @@ export class ContributeComponent implements OnInit {
    
 
   }
-  // dev_fund_change(value){
+  dev_fund_change(value){
-  //   if(value != ''){
+    if(value != ''){
-  //   if(value<=0){
+    if(value<=0){
-  //     alert('Given value is Invalid');
+      alert('Given value is Invalid');
-  //     this.general_devlop_amt=''
+      this.general_devlop_amt=''
-  //   }
+    }
-  // }
+  }
-  // }
+  }
    
   getSchoolReqList2()
   {
@@ -480,118 +457,5 @@ export class ContributeComponent implements OnInit {
     window.location.reload();
 }
 
-openDialog(): void {
-  const dialogRef = this.dialog.open(ContributeFundComponent, {
-    width: '600px',
-    height: '600px', 
-  });
-  dialogRef.afterClosed().subscribe(result => {
-    console.log('The dialog was closed',result);
-    this.gen_dev_fund_remarks=result.fund_remark;
-    this.general_devlop_amt=result.fund_contribute;
-    this.storeData_session();
-
-  });
-} 
-
-searchFun(control:any,option){
-  console.log("control",control)
-        if (option == 'district') {
-        console.log(control)
-        control.controls['districtSearch'].valueChanges
-          .pipe(takeUntil(this._onDestroy))
-          .subscribe(()=>{
-            this.searchDistrict(control.controls['districtSearch'].value)
-          })
-      }
-       if (option == 'school') { 
-        control.controls['schoolSearch'].valueChanges
-          .pipe(takeUntil(this._onDestroy))
-          .subscribe(() => {
-            this.SearchSchool(control.controls['schoolSearch'].value);
-          })
-      }
-      if (option == 'category') {
-        // console.log("category")
-        control.controls['categorySearch'].valueChanges
-          .pipe(takeUntil(this._onDestroy))
-          .subscribe(()=>{
-            this.searchCategory(control.controls['categorySearch'].value)
-          })
-      }
-      if (option == 'material_category') {
-        // console.log("material_category")
-        control.controls['materialsSearch'].valueChanges
-          .pipe(takeUntil(this._onDestroy))
-          .subscribe(()=>{
-            this.searchmaterials(control.controls['materialsSearch'].value)
-          })
-      }
-    }
-    searchDistrict(val: any) {
-      console.log("districtData")
-      if (!this.districtData) {
-        return
-      }
-      let searchVal = val
-      if (!searchVal) { 
-       this.district=this.districtData.slice()
-        return
-      }
-      else {
-        searchVal = searchVal.toLowerCase()
-      }
-      this.district=this.districtData.filter(res => res.district_name.toLowerCase().indexOf(searchVal) > -1)
-      
-    }
-    SearchSchool(val: any) {
-      console.log("schoolData")
-      if (!this.schoolData) {
-        return
-      }
-      let searchVal = val
-      if (!searchVal) { 
-       this.school=this.schoolData.slice()
-        return
-      }
-      else {
-        searchVal = searchVal.toLowerCase()
-      }
-      this.school=this.schoolData.filter(res => res.school_name.toLowerCase().indexOf(searchVal) > -1)
-      
-    }
-    searchCategory(val: any) {
-      console.log("categoryData")
-      if (!this.categoryData) {
-        return
-      }
-      let searchVal = val
-      if (!searchVal) { 
-       this.category=this.categoryData.slice()
-        return
-      }
-      else {
-        searchVal = searchVal.toLowerCase()
-      }
-      this.category=this.categoryData.filter(res => res.cat_name.toLowerCase().indexOf(searchVal) > -1)
-      
-    }
-    searchmaterials(val: any) {
-      console.log(this.materialsData)
-      if (!this.materialsData) {
-        return
-      }
-      let searchVal = val
-      if (!searchVal) { 
-       this.material_category.materials=this.materialsData.slice()
-        return
-      }
-      else {
-        searchVal = searchVal.toLowerCase()
-      }
-      this.material_category.materials=this.materialsData.filter(res => res.material_name.toLowerCase().indexOf(searchVal) > -1)
-      
-    }
-
 }