changes by suren

This commit is contained in:
sriram-at-840620226347 2019-10-11 20:25:32 +05:30
parent 9f98ee256f
commit 2f7a3260a2
14 changed files with 818 additions and 614 deletions

View File

@ -2,7 +2,7 @@
<!--starts--> <!--starts-->
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0"> <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"> --> <!-- <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="40" fxFlex.lg="1000" fxFlex.xl="40"> -->
<mat-card class="p-2" fxFlex="70%" fxFlex.xs="100" fxFlex.sm="100"> <mat-card class="p-2" fxFlex="71%" fxFlex.xs="100" fxFlex.sm="100">
<mat-card-title class="mb-1"><h5 class="mt-0 text-center">Contribute to Specific Need </h5></mat-card-title> <mat-card-title class="mb-1"><h5 class="mt-0 text-center">Contribute to Specific Need </h5></mat-card-title>
<hr> <hr>
<form [formGroup]="Contribute"> <form [formGroup]="Contribute">
@ -51,14 +51,14 @@
<!-- Requirement Column --> <!-- Requirement Column -->
<!-- <ng-container matColumnDef="Requirement"> <!-- <ng-container matColumnDef="Requirement">
<th style="width: 15% !important;" mat-header-cell *matHeaderCellDef mat-sort-header></th> <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> <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> --> </ng-container> -->
<!-- Item Need Column --> <!-- Item Need Column -->
<ng-container matColumnDef="Item Need"> <ng-container matColumnDef="Item Need">
<th style="width: 15% !important;text-align: right;float: center" mat-header-cell *matHeaderCellDef mat-sort-header>Item Needed</th> <th style="width: 25% !important;text-align: right;float: center" mat-header-cell *matHeaderCellDef mat-sort-header>Item Needed</th>
<td style="width: 15% !important;" mat-cell *matCellDef="let row" class="product-thumbnail"><span> {{row.material_name}} </span></td> <td style="width: 25% !important;" mat-cell *matCellDef="let row" class="product-thumbnail"><span> {{row.material_name}} </span></td>
</ng-container> </ng-container>
<!-- School Column --> <!-- School Column -->
@ -69,36 +69,36 @@
<!-- Quantity Column --> <!-- Quantity Column -->
<ng-container matColumnDef="Required Qty"> <ng-container matColumnDef="Required Qty">
<th style="width: 8% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Required Qty </th> <th style="width: 8% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Required Qty </th>
<td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty}}</td> <td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="Received Qty"> <ng-container matColumnDef="Received Qty">
<th style="width: 10% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Received Qty </th> <th style="width: 8% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Received Qty </th>
<td style="width: 10% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.received_qty}}</td> <td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.received_qty}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="balance Qty"> <ng-container matColumnDef="balance Qty">
<th style="width: 8% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Balance Qty </th> <th style="width: 8% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Balance Qty </th>
<td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }}</td> <td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }}</td>
</ng-container> </ng-container>
<!-- Sponsor Column --> <!-- Sponsor Column -->
<ng-container matColumnDef="Sponsor Qty"> <ng-container matColumnDef="Sponsor Qty">
<th style="width: 10% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Sponsored Qty </th> <th style="width: 10% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Sponsored Qty </th>
<td style="width: 10% !important;" mat-cell *matCellDef="let row;let i = index"> <input 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)" style="width: 100% !important;text-align: center;"> </td> <td style="width: 10% !important;text-align: center;" mat-cell *matCellDef="let row;let i = index"> <input 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)" style="width: 100% !important;text-align: center;"> </td>
</ng-container> </ng-container>
<!-- price Column --> <!-- price Column -->
<ng-container matColumnDef="Cost Per Unit"> <ng-container matColumnDef="Cost Per Unit">
<th align="right" style="width: 20% !important;text-align: right;align-items: center" mat-header-cell *matHeaderCellDef mat-sort-header > Cost Per Unit (in Rs) </th> <th align="right" style="width: 8% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Cost Per Unit<br> (in Rs) </th>
<td style="width: 15% !important;text-align: right;;" mat-cell *matCellDef="let row;" > {{row.cost_per_unit === null?0:row.cost_per_unit}} </td> <td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row;" > {{row.cost_per_unit === null?0:row.cost_per_unit}} </td>
<!-- <td mat-footer-cell *matFooterCellDef> Total </td> --> <!-- <td mat-footer-cell *matFooterCellDef> Total </td> -->
</ng-container> </ng-container>
<!-- Total Column --> <!-- Total Column -->
<ng-container matColumnDef="Amount"> <ng-container matColumnDef="Amount">
<th style="width: 20% !important;" mat-header-cell *matHeaderCellDef mat-sort-header style="text-align: right;"> Amount <br/>(in Rs) </th> <th style="width: 8% !important;text-align: right;" mat-header-cell *matHeaderCellDef style="text-align: right;"> Amount <br/>(in Rs) </th>
<td style="width: 20% !important;" mat-cell *matCellDef="let row ;let i=index" style="text-align: right;">{{Total[i]}} </td> <td style="width: 8% !important;text-align: right;" mat-cell *matCellDef="let row ;let i=index" style="text-align: right;">{{Total[i]}} </td>
<!-- <td mat-footer-cell *matFooterCellDef> {{somethingChanged()}} </td> --> <!-- <td mat-footer-cell *matFooterCellDef> {{somethingChanged()}} </td> -->
</ng-container> </ng-container>
@ -152,14 +152,14 @@
<!--</mat-card-title> --> <!--</mat-card-title> -->
<!-- </mat-card-header> --> <!-- </mat-card-header> -->
<mat-card-content> <mat-card-content>
<p class="quote" style="margin-top:4px;text-align: center">&#8221;Alone we can do so little, together we can do so much&#8221; <br/>- Hellen Keller</p> <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 State School Development Fund</h5> <h5 class="text-center"> Contribute to<br> State School Development Fund</h5>
<div fxLayout="column" fxLayoutAlign="start stretch"> <div fxLayout="column" fxLayoutAlign="start stretch">
<!-- <div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0"> --> <!-- <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"> <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;"> <mat-form-field appearance="outline" style="width: 70%;text-align: center;">
<input matInput type="tel" placeholder="Amount" [(ngModel)]="general_devlop_amt" maxlength="10" (change)="dev_fund_change($event.target.value)" onkeypress="return event.charCode >= 48 && event.charCode <= 57"> <input matInput type="tel" 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> </mat-form-field>
<!-- </div> --> <!-- </div> -->
</div> </div>
@ -190,8 +190,8 @@
<mat-form-field dividerColor="warn" class="ml-xs mr-xs" style="width: 100%;" appearance="outline"> <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> <textarea matInput placeholder="Comments" rows="5" [(ngModel)]="gen_dev_fund_remarks"></textarea>
</mat-form-field> </mat-form-field>
<button class="mat-green" mat-raised-button style="color:white" (click)="storeData_session()">Proceed to Contribute</button> <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. But we make a life by what we give&#8221; <br/>- Winston Churchill</p> <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> </div>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>

View File

@ -7,7 +7,7 @@
<div class="close_icon" (click)="closeDialog()"> <div class="close_icon" (click)="closeDialog()">
<mat-icon >close</mat-icon> <mat-icon >close</mat-icon>
</div> </div>
<h2 class="base-border">Login Form</h2> <h2 class="base-border">Login</h2>
<p>Enter Your Login Details</p> <p>Enter Your Login Details</p>
<form [formGroup]="loginForm"> <form [formGroup]="loginForm">
<div fxLayout="column" fxLayoutAlign="start stretch"> <div fxLayout="column" fxLayoutAlign="start stretch">

View File

@ -91,8 +91,8 @@
</mat-card> </mat-card>
</div> </div>
<div *ngIf="payment_mode == '2' && contribute_type != '2'" class="ac_det"> <div *ngIf="payment_mode == '2' && contribute_type != '2'" class="ac_det">
<p>A/c Name : Tamil Nadu State Parent Teacher</p> <p>A/c Name : Tamil Nadu State Parent Teacher Association - CSR Funds</p>
<p>Association : CSR Funds</p> <!-- <p>Association : CSR Funds</p> -->
<p>A/C Number : 142301000022944</p> <p>A/C Number : 142301000022944</p>
<p>MICR : 600020076</p> <p>MICR : 600020076</p>
<p>IFSC : IOBA0001423</p> <p>IFSC : IOBA0001423</p>

View File

@ -40,7 +40,105 @@
<button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button> <button mat-raised-button [routerLink]="['/contribute']" class="button-cyan">Contribute</button>
</div> --> </div> -->
<div class="separator"></div> <div class="separator"></div>
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0" class="mt-1"> <!-- <div fxLayout="row wrap">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxFlex="100" class="m-gap p-gap">
<mat-card>
<div class="card-wheather grad-blue">
<div class="city">New Orders</div>
<div class="date">This Week</div>
<div class="weather">
<div class="sun d-flex justify-content-between">
<i class="fa fa-shopping-bag fa-3x "></i>
<div class="temp ">190</div>
</div>
</div>
</div>
</mat-card>
</div>
</div>
<div fxLayout="row wrap">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxFlex="100" class="m-gap p-gap">
<mat-card>
<div class="card-wheather grad-blue">
<div class="city">New Orders</div>
<div class="date">This Week</div>
<div class="weather">
<div class="sun d-flex justify-content-between">
<i class="fa fa-shopping-bag fa-3x "></i>
<div class="temp ">190</div>
</div>
</div>
</div>
</mat-card>
</div>
</div> -->
<div fxLayout="row wrap" fxLayoutAlign="center none">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="45.33" fxFlex.lg="45.33" fxFlex.xl="45.33" fxFlex="100" class="p-gap">
<mat-card class="grad-blue" style="padding:10px;height: 74px;">
<h5 class="temp mt-0">Classes</h5>
<h6 class="mt-0" style="text-align: right;">{{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}}</h6>
</mat-card>
</div>
</div>
<div fxLayout="row wrap">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="45.33" fxFlex.lg="45.33" fxFlex.xl="45.33" fxFlex="100" class="p-gap">
<mat-card class="grad-blue" style="padding:10px;height: 74px;">
<div fxLayout fxLayout="row" fxLayoutGap.xs="0">
<div fxFlex.sm="50" fxFlex.xs="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap">
<h5 class="temp mt-0">Students</h5>
</div>
<div fxLayoutAlign="end none" fxFlex.sm="50" fxFlex.xs="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap">
<h5 class="temp mt-0">&nbsp;{{schoolInfo.total}}</h5>
</div>
</div>
<div fxLayout fxLayout="row" fxLayoutGap.xs="0">
<div fxLayoutAlign="end none" fxFlex.sm="75" fxFlex.xs="75" fxFlex.md="75" fxFlex.lg="75" fxFlex.xl="75"class="p-gap">
<i class="fa fa-male fa-2x "></i>
<div class="temp ">&nbsp;{{schoolInfo.total_b}}</div>
</div>
<div fxLayoutAlign="end none" fxFlex.sm="25" fxFlex.xs="25" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="p-gap">
<i class="fa fa-female fa-2x "></i>
<div class="temp ">&nbsp;{{schoolInfo.total_g}}</div>
</div>
</div>
<!-- <h6 class="mt-0" style="text-align: right;">{{schoolInfo.total}}</h6> -->
</mat-card>
</div>
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="45.33" fxFlex.lg="45.33" fxFlex.xl="45.33" fxFlex="100" class="p-gap">
<mat-card class="grad-blue" style="padding:10px;height: 74px;">
<div fxLayout fxLayout="row" fxLayoutGap.xs="0">
<div fxFlex.sm="50" fxFlex.xs="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap">
<h5 class="temp mt-0">Staff</h5>
</div>
<div fxLayoutAlign="end none" fxFlex.sm="50" fxFlex.xs="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap">
<h5 class="temp mt-0">&nbsp;{{schoolInfo.totstaff}}</h5>
</div>
</div>
<div fxLayout fxLayout="row" fxLayoutGap.xs="0">
<div fxLayoutAlign="end none" fxFlex.sm="40" fxFlex.xs="40" fxFlex.md="40" fxFlex.lg="40" fxFlex.xl="40"class="p-gap">
<div class="temp ">&nbsp;{{schoolInfo.teach_tot}}<span class="mt-0 mb-0" style="font-size:10px;margin-left: 12px;">Teaching</span></div>
</div>
<div fxLayoutAlign="end none" fxFlex.sm="60" fxFlex.xs="60" fxFlex.md="60" fxFlex.lg="60" fxFlex.xl="60" class="p-gap">
<div class="temp ">&nbsp;{{schoolInfo.nonteach_tot}}<span class="mt-0 mb-0" style="font-size:10px;margin-left: 10px;">Non-Teaching</span></div>
</div>
</div>
<!-- <h6 class="mt-0" style="text-align: right;">{{schoolInfo.total}}</h6> -->
</mat-card>
</div>
</div>
<!-- <div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0" class="mt-1">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<h5 class="mt-0">Classes</h5> <h5 class="mt-0">Classes</h5>
</div> </div>
@ -48,8 +146,7 @@
<div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-1"> <div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-1">
<div fxLayoutAlign="center" fxFlex.sm="55.33" fxFlex.xs="55.33" fxFlex.md="43.33" fxFlex.lg="43.33" fxFlex.xl="43.33"> <div fxLayoutAlign="center" fxFlex.sm="55.33" fxFlex.xs="55.33" fxFlex.md="43.33" fxFlex.lg="43.33" fxFlex.xl="43.33">
<div class="sun d-flex"> <div class="sun d-flex">
<!-- <i class="fa fa-users fa-2x align-self-center"></i> --> <div class="temp ">&nbsp;{{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 class="temp align-self-center">&nbsp;{{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>
</div> </div>
@ -61,20 +158,19 @@
<div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-1"> <div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-1">
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<!-- <i class="fa fa-users fa-2x align-self-center"></i> --> <div class="temp ">&nbsp;{{schoolInfo.total}}</div>
<div class="temp align-self-center">&nbsp;{{schoolInfo.total}}</div>
</div> </div>
</div> </div>
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<i class="fa fa-male fa-2x align-self-center"></i> <i class="fa fa-male fa-2x "></i>
<div class="temp align-self-center">&nbsp;{{schoolInfo.total_b}}</div> <div class="temp ">&nbsp;{{schoolInfo.total_b}}</div>
</div> </div>
</div> </div>
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<i class="fa fa-female fa-2x align-self-center"></i> <i class="fa fa-female fa-2x "></i>
<div class="temp align-self-center">&nbsp;{{schoolInfo.total_g}}</div> <div class="temp ">&nbsp;{{schoolInfo.total_g}}</div>
</div> </div>
</div> </div>
@ -87,24 +183,24 @@
<div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-2"> <div fxLayout fxLayout="row" fxLayoutGap.xs="0" class="mb-2">
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<div class="temp align-self-center">&nbsp;{{schoolInfo.totstaff}}</div> <div class="temp ">&nbsp;{{schoolInfo.totstaff}}</div>
</div> </div>
</div> </div>
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<div class="temp align-self-center" style="text-align: center;">&nbsp;{{schoolInfo.teach_tot}}<br><p class="mt-0 mb-0" style="font-size:10px;margin-left: 12px;">Teaching</p></div> <div class="temp " style="text-align: center;">&nbsp;{{schoolInfo.teach_tot}}<br><p class="mt-0 mb-0" style="font-size:10px;margin-left: 12px;">Teaching</p></div>
</div> </div>
</div> </div>
<div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33"> <div fxLayoutAlign="center" fxFlex.sm="33.33" fxFlex.xs="33.33" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33">
<div class="sun d-flex"> <div class="sun d-flex">
<div class="temp align-self-center" style="text-align: center;">&nbsp;{{schoolInfo.nonteach_tot}}<br><p class="mt-0 mb-0" style="font-size:10px;margin-left: 10px;">Non-Teaching</p></div> <div class="temp " style="text-align: center;">&nbsp;{{schoolInfo.nonteach_tot}}<br><p class="mt-0 mb-0" style="font-size:10px;margin-left: 10px;">Non-Teaching</p></div>
</div> </div>
</div> </div>
</div> </div> -->
<div fxLayout fxLayout="row" fxLayout.xs="column" fxLayoutGap.xs="0"> <div class="mt-3" 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"> <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 (click)="toTop($event)" class="button-cyan">Contribute</button> <button mat-raised-button (click)="toTop($event)" class="button-cyan">Contribute</button>
</div> </div>

View File

@ -259,3 +259,47 @@ table th {
//wheather
.card-wheather {
height: 220px;
color: #fff;
}
.city {
font-size: 26px;
}
.date {
font-size: 20px;
line-height: 40px;
}
.sun {
height: 70px;
}
.grad-blue {
background: linear-gradient(58deg, #f44336, #673ab7);
color: #fff;
}
.grad-green {
background: linear-gradient(58deg, #009688, #673ab7);
color: #fff;
}
.grad-red {
background: linear-gradient(58deg, #f44336, #673ab7);
color: #fff;
}
.card-wheather{
padding: 2rem;
}
.temp {
font-size: 14px;
display: inline-block;
}

View File

@ -1,5 +1,5 @@
<mat-card> <mat-card>
<mat-card-title><h5 class="mt-0">Projects</h5></mat-card-title> <mat-card-title><h5 class="mt-0">Requirements</h5></mat-card-title>
<hr><br/> <hr><br/>
<!-- <div fxLayout="row" fxLayoutAlign="center center" > --> <!-- <div fxLayout="row" fxLayoutAlign="center center" > -->
@ -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 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-main mb-2">
<div class="p-list"> <div class="p-list">
<div class="top"><img src="{{schooldetails.images[0]}}" onerror="this.onerror=null;this.src='assets/images/csr-img/error_img.jpg';" alt=""></div> <div class="top"><img src="{{schooldetails.images[0]}}" onerror="this.onerror=null;this.src='assets/images/csr-img/error_img.jpg';"></div>
<div class="bottom"> <div class="bottom">
<div class="left"> <div class="left">
<div class="details" style="width: unset !important;"> <div class="details" style="width: unset !important;">
@ -54,6 +54,11 @@
</div> </div>
</div> </div>
</div> </div>
<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">
<mat-card style="height: 85%;" fxLayoutAlign="center center" [routerLink]="['/contribute']">
<h1 class="text"><span> More</span></h1>
</mat-card>
</div>
<!-- <div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="23.33" fxFlex.lg="23.33" fxFlex.xl="23.33" class="m-gap p-gap"> --> <!-- <div fxFlex.sm="33.33" fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="23.33" fxFlex.lg="23.33" fxFlex.xl="23.33" class="m-gap p-gap"> -->
<!-- <div class="p-list-main mb-2"> <!-- <div class="p-list-main mb-2">

View File

@ -197,3 +197,40 @@ mat-card{
height: 100%; height: 100%;
width:100%; width:100%;
} }
.text {
border-radius: 4px;
// background-color: #e91e63;
border: none;
color: #51caca;
text-align: center;
font-size: 30px;
padding: 5px;
width: 200px;
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;
}

View File

@ -2,54 +2,54 @@
<!-- Requirement Column --> <!-- Requirement Column -->
<!-- <ng-container matColumnDef="Item Need"> <!-- <ng-container matColumnDef="Item Need">
<th style="width: 15% !important;text-align: right;float: center" mat-header-cell *matHeaderCellDef mat-sort-header>Item Needed</th> <th style="width: 15% !important;text-align: right;float: center" mat-header-cell *matHeaderCellDef >Item Needed</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"><br/><span> {{row.material_name}} </span></td> <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"><br/><span> {{row.material_name}} </span></td>
</ng-container> --> </ng-container> -->
<!-- Item Need Column --> <!-- Item Need Column -->
<ng-container matColumnDef="Item Need"> <ng-container matColumnDef="Item Need">
<th style="width: 20% !important;text-align: right;float: center" mat-header-cell *matHeaderCellDef mat-sort-header>Item Needed</th> <th style="width: 20% !important;" mat-header-cell *matHeaderCellDef >Item Needed</th>
<td style="width: 20% !important;" mat-cell *matCellDef="let row" class="product-thumbnail"><span> {{row.material_name}} </span></td> <td style="width: 20% !important;" mat-cell *matCellDef="let row" class="product-thumbnail"><span> {{row.material_name}} </span></td>
</ng-container> </ng-container>
<!-- School Column --> <!-- School Column -->
<ng-container matColumnDef="School"> <ng-container matColumnDef="School">
<th style="width: 25% !important;text-align: center !important;" mat-header-cell *matHeaderCellDef mat-sort-header>School</th> <th style="width: 26% !important;" mat-header-cell *matHeaderCellDef >School</th>
<td style="width: 25% !important;" mat-cell *matCellDef="let row"> <a [routerLink]="'/home/project-detail'">{{row.school_name}}</a>, {{row.block_name}} Block, {{row.district_name}} District.</td> <td style="width: 26% !important;" mat-cell *matCellDef="let row"> <a [routerLink]="'/home/project-detail'">{{row.school_name}}</a>, {{row.block_name}} Block, {{row.district_name}} District.</td>
</ng-container> </ng-container>
<!-- Quantity Column --> <!-- Quantity Column -->
<ng-container matColumnDef="Required Qty"> <ng-container matColumnDef="Required Qty">
<th style="width: 10% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Required Qty </th> <th style="width: 10% !important;text-align: center !important;" mat-header-cell *matHeaderCellDef > Required Qty </th>
<td style="width: 10% !important;" mat-cell *matCellDef="let row"> {{row.qty}}</td> <td style="width: 10% !important;text-align: center !important;" mat-cell *matCellDef="let row"> {{row.qty}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="Received Qty"> <ng-container matColumnDef="Received Qty">
<th style="width: 10% !important;;text-align: center;" mat-header-cell *matHeaderCellDef mat-sort-header> Received Qty </th> <th style="width: 10% !important;;text-align: center;" mat-header-cell *matHeaderCellDef > Received Qty </th>
<td style="width: 10% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.received_qty}}</td> <td style="width: 10% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.received_qty}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="balance Qty"> <ng-container matColumnDef="balance Qty">
<th style="width: 8% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Balance Qty </th> <th style="width: 8% !important;text-align: center !important;" mat-header-cell *matHeaderCellDef > Balance Qty </th>
<td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }}</td> <td style="width: 8% !important;text-align: center;" mat-cell *matCellDef="let row"> {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }}</td>
</ng-container> </ng-container>
<!-- Sponsor Column --> <!-- Sponsor Column -->
<ng-container matColumnDef="Sponsor Qty"> <ng-container matColumnDef="Sponsor Qty">
<th style="width: 10% !important;text-align: center" mat-header-cell *matHeaderCellDef mat-sort-header> Sponsor Qty </th> <th style="width: 10% !important;text-align: center;" mat-header-cell *matHeaderCellDef > Sponsor Qty </th>
<td style="width: 10% !important;text-align: center" mat-cell *matCellDef="let row;let i = index"> {{row.sponsor_qty}} </td> <td style="width: 10% !important;text-align: center;" mat-cell *matCellDef="let row;let i = index"> {{row.sponsor_qty}} </td>
</ng-container> </ng-container>
<!-- price Column --> <!-- price Column -->
<ng-container matColumnDef="Cost Per Unit"> <ng-container matColumnDef="Cost Per Unit">
<th style="width: 10%!important;text-align: right" mat-header-cell *matHeaderCellDef mat-sort-header> Cost Per Unit<br/> (in Rs) </th> <th style="width: 10%!important;text-align: center;" mat-header-cell *matHeaderCellDef > Cost Per Unit<br/> (in Rs) </th>
<td style="width: 10% ;text-align: center" mat-cell *matCellDef="let row;" > {{row.cost_per_unit === null ? 0 : row.cost_per_unit}} </td> <td style="width: 10% ;text-align: center;" mat-cell *matCellDef="let row;" > {{row.cost_per_unit === null ? 0 : row.cost_per_unit}} </td>
<!-- <td mat-footer-cell *matFooterCellDef> Total </td> --> <!-- <td mat-footer-cell *matFooterCellDef> Total </td> -->
</ng-container> </ng-container>
<!-- Total Column --> <!-- Total Column -->
<ng-container matColumnDef="Amount"> <ng-container matColumnDef="Amount">
<th style="width: 20% !important;" mat-header-cell *matHeaderCellDef mat-sort-header> Amount (in Rs) </th> <th style="width: 20% !important;text-align: right;" mat-header-cell *matHeaderCellDef > Amount (in Rs) </th>
<td style="width: 20% !important;" mat-cell *matCellDef="let row ;let i=index" style="text-align: right">{{row.amount}} </td> <td style="width: 20% !important;text-align: right;" mat-cell *matCellDef="let row ;let i=index" style="text-align: right">{{row.amount}} </td>
<!-- <td mat-footer-cell *matFooterCellDef> {{somethingChanged()}} </td> --> <!-- <td mat-footer-cell *matFooterCellDef> {{somethingChanged()}} </td> -->
</ng-container> </ng-container>

View File

@ -50,24 +50,16 @@ showCaptions="true"
<div class="mt-0"> <div class="mt-0">
<mat-card-title><h5 class="mt-0 mb-1 text-center">Support Recieved</h5></mat-card-title> <mat-card-title><h5 class="mt-0 mb-1 text-center">Support Recieved</h5></mat-card-title>
<hr style="border-top:2px solid rgb(81, 202, 202) !important;width:190px !important;"> <hr style="border-top:2px solid rgb(81, 202, 202) !important;width:190px !important;">
<div fxLayout="row" class="text-center mt-1 mb-1"> <div fxLayout="row" class="text-center mt-2 mb-1">
<div fxFlex="50"> <div fxFlex="100">
<h2 class="mt-0 logo_one" style="color: #f9a22b !important;"><span>1000+</span></h2> <h2 class="mt-0 logo_one" style="color: #f9a22b !important;"><span>18</span></h2>
<p>Desktop Computers</p> <p>Supporters</p>
</div>
<div fxFlex="50">
<h2 class="mt-0 logo_one" style="color: #000000 !important;"><span>75+</span></h2>
<p>Smart Boards</p>
</div> </div>
</div> </div>
<div fxLayout="row" class="text-center mt-1 mb-1"> <div fxLayout="row" class="text-center mt-1 mb-1">
<div fxFlex="50"> <div fxFlex="100">
<h2 class="mt-0 logo_one" style="color: #a978e0 !important;"><span>80+</span></h2> <h2 class="mt-0 logo_one" style="color: #a978e0 !important;"><span>Rs.80,00,000</span></h2>
<p>Televisions</p> <p>Contributed</p>
</div>
<div fxFlex="50">
<h2 class="mt-0 logo_one" style="color: #a978e0 !important;"><span>50+</span></h2>
<p>Printers</p>
</div> </div>
</div> </div>
<div fxLayout="row" class="text-center mt-1 mb-1"> <div fxLayout="row" class="text-center mt-1 mb-1">

View File

@ -20,7 +20,8 @@ export class DashboardComponent {
{img: "assets/images/csr-img/TN_client_logo/9.png"}, {img: "assets/images/csr-img/TN_client_logo/9.png"},
{img: "assets/images/csr-img/TN_client_logo/10.png"}, {img: "assets/images/csr-img/TN_client_logo/10.png"},
{img: "assets/images/csr-img/TN_client_logo/11.png"}, {img: "assets/images/csr-img/TN_client_logo/11.png"},
{img: "assets/images/csr-img/TN_client_logo/12.png"} {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": true,"infinite": true,"autoplay": true,"autoplaySpeed": 1200};

View File

@ -1,5 +1,5 @@
<div class="app search-i" [dir]="layoutDir" [ngClass]="[ menuLayout, selectedSidebarImage, selectedSidebarColor, selectedHeaderColor, collapsedClass]" [class.app-dark]="dark" [class.boxed]="boxed" [class.collapsed-sidebar]="collapseSidebar" [class.compact-sidebar]="compactSidebar" [class.bg-img-disable]="!sidebarBg"> <div class="app search-i" [dir]="layoutDir" [ngClass]="[ menuLayout, selectedSidebarImage, selectedSidebarColor, selectedHeaderColor, collapsedClass]" [class.app-dark]="dark" [class.boxed]="boxed" [class.collapsed-sidebar]="collapseSidebar" [class.compact-sidebar]="compactSidebar" [class.bg-img-disable]="!sidebarBg">
<mat-sidenav-container class="app-inner"> <mat-sidenav-container class="app-inner">
<mat-sidenav #sidemenu class="sidebar-panel" id="sidebar-panel" [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" (mouseover)="menuMouseOver()" (mouseout)="menuMouseOut()"> <mat-sidenav #sidemenu class="sidebar-panel" id="sidebar-panel" [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" (mouseover)="menuMouseOver()" (mouseout)="menuMouseOut()">
<div class="opt-side relative "> <div class="opt-side relative ">
<div class="sidebar-container "> <div class="sidebar-container ">
@ -62,7 +62,7 @@
</mat-list-item> </mat-list-item>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<!-- <mat-list-item> <!-- <mat-list-item>
<a (click)="addMenuItem()"> <a (click)="addMenuItem()">
<mat-icon>add</mat-icon> <mat-icon>add</mat-icon>
<span>Add</span> <span>Add</span>
@ -74,7 +74,7 @@
</div> </div>
<div class="bg-overlay"></div> <div class="bg-overlay"></div>
</mat-sidenav> </mat-sidenav>
<mat-toolbar class="main-header"> <mat-toolbar class="main-header" style="height: 95px !important;">
<div class="horizontal-top-bar w-100"> <div class="horizontal-top-bar w-100">
<!-- <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100"> <!-- <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
<div class="search-bar" fxFlex> <div class="search-bar" fxFlex>
@ -87,7 +87,7 @@
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="100.33" fxFlex.xl="33.33" fxFlex="100"> <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="100.33" fxFlex.xl="33.33" fxFlex="100">
<div class="horizontal-logo"> <div class="horizontal-logo">
<div class="header-name"> <div class="header-name">
<h2><a href="#"><img src="assets/images/csr-img/tn_logo.png" style="width:35%;height:54px;"></a> <h2><a href="#"><img src="assets/images/csr-img/tn_logo.png" style="width:40%;height:60px;"></a>
</h2> </h2>
</div> </div>
</div> </div>
@ -97,17 +97,27 @@
<nav> <nav>
<ul class="main-h-list" style="font-size: 16px;"> <ul class="main-h-list" style="font-size: 16px;">
<li *ngFor="let menuitem of horizontalMenuItems.getAll()"> <li *ngFor="let menuitem of horizontalMenuItems.getAll()">
<a *ngIf="menuitem.type === 'link'" (click)="navRedirection(menuitem)"> <a *ngIf="menuitem.type === 'link' && menuitem.name != 'Login'" (click)="navRedirection(menuitem)">
<!--<mat-icon>{{ menuitem.icon }}</mat-icon>--> <!--<mat-icon>{{ menuitem.icon }}</mat-icon>-->
<span><strong>{{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : user_name : menuitem.name | translate }}</strong></span> <span><strong>{{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : '' : menuitem.name | translate }}</strong></span>
</a> </a>
<a [routerLink]="['/'+menuitem.state]" *ngIf="menuitem.type === 'sub'"> <a *ngIf="menuitem.type === 'link' && menuitem.name == 'Login' && user_name == ''" (click)="navRedirection(menuitem)">
<mat-icon>{{ menuitem.icon }}</mat-icon> <!--<mat-icon>{{ menuitem.icon }}</mat-icon>-->
<span>{{ menuitem.name | translate }}</span> <span><strong>{{ menuitem.name | translate }}</strong></span>
</a> </a>
<ul class="dropdown" *ngIf="menuitem.type === 'sub'">
<a [routerLink]="['/'+menuitem.state]" *ngIf="menuitem.type === 'sub' && menuitem.name != 'My Account'">
<!-- <mat-icon>{{ menuitem.icon }}</mat-icon> -->
<span style="text-transform: capitalize;"><strong>{{ menuitem.name == 'My Account' ? user_name == '' ? menuitem.name : user_name : menuitem.name | translate }}</strong></span>
</a>
<a [routerLink]="['/'+menuitem.state]" *ngIf="menuitem.type === 'sub' && menuitem.name == 'My Account' && user_name != ''">
<!-- <mat-icon>{{ menuitem.icon }}</mat-icon> -->
<span style="text-transform: capitalize;"><strong>{{ menuitem.name == 'My Account' ? user_name == '' ? menuitem.name : user_name : menuitem.name | translate }}</strong></span>
</a>
<ul class="dropdown" *ngIf="menuitem.type === 'sub' && user_name != ''">
<li *ngFor="let childitem of menuitem.children"> <li *ngFor="let childitem of menuitem.children">
<a [routerLink]="['/'+childitem.state ]">{{ childitem.name | translate }}</a> <a (click)="SubMenu(childitem)">{{ childitem.name | translate }}</a>
<ul class="dropdown" *ngIf="childitem.type === 'super-sub'"> <ul class="dropdown" *ngIf="childitem.type === 'super-sub'">
<li *ngFor="let subchild of childitem.subchildren"> <li *ngFor="let subchild of childitem.subchildren">
<a [routerLink]="['/'+subchild.state ]">{{subchild.name | translate}}</a> <a [routerLink]="['/'+subchild.state ]">{{subchild.name | translate}}</a>
@ -116,9 +126,9 @@
</li> </li>
</ul> </ul>
</li> </li>
<li style="cursor: pointer"> <!-- <li style="cursor: pointer">
<span *ngIf="user_name != ''" (click)="signOut()"><strong>Log Out</strong></span> <span *ngIf="user_name != ''" (click)="signOut()"><strong>Log Out</strong></span>
</li> </li> -->
</ul> </ul>
</nav> </nav>
</div> </div>
@ -405,12 +415,12 @@
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
</mat-sidenav> </mat-sidenav>
</mat-sidenav-container> </mat-sidenav-container>
<!-- Demo Purposes Only --> <!-- Demo Purposes Only -->
<!-- <button mat-fab color="warn" class="mat-fab-bottom-right" (click)="showSettings = true"> <!-- <button mat-fab color="warn" class="mat-fab-bottom-right" (click)="showSettings = true">
<mat-icon class="mat-24">settings</mat-icon> <mat-icon class="mat-24">settings</mat-icon>
</button> </button>
<mat-card class="settings-panel" *ngIf="showSettings"> <mat-card class="settings-panel" *ngIf="showSettings">
<mat-toolbar color="warn"> <mat-toolbar color="warn">
<span fxFlex>Options</span> <span fxFlex>Options</span>
<button mat-icon-button (click)="showSettings = false"> <button mat-icon-button (click)="showSettings = false">
@ -557,12 +567,13 @@
</mat-form-field> </mat-form-field>
</div> </div>
</mat-card-content> </mat-card-content>
</mat-card> --> </mat-card> -->
<!-- /Demo Purposes Only --> <!-- /Demo Purposes Only -->
</div> </div>
<!-- <app-footer style="overflow: hidden;"></app-footer> --> <!-- <app-footer style="overflow: hidden;"></app-footer> -->
<!-- <footer class="footer"> <!-- <footer class="footer">
<h5>&#9400; TN Schools, All rights reserved</h5> <h5>&#9400; TN Schools, All rights reserved</h5>
</footer> --> </footer> -->

View File

@ -237,7 +237,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
// [routerLink]="['/'+menuitem.state]" // [routerLink]="['/'+menuitem.state]"
navRedirection(menuitem){ navRedirection(menuitem){
console.log(menuitem,this.user_name) console.log(menuitem,this.user_name)
if(menuitem.state == 'authentication'){ if(menuitem.state == 'login'){
if(this.user_name != ''){ if(this.user_name != ''){
// return // return
this.router.navigateByUrl('/user-profile') this.router.navigateByUrl('/user-profile')
@ -287,4 +287,12 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
this.router.navigateByUrl('/'+menuitem.state) this.router.navigateByUrl('/'+menuitem.state)
} }
} }
SubMenu(childitem){
if(childitem.name == 'Log Out'){
this.signOut()
}
else{
this.router.navigateByUrl('/'+childitem.state)
}
}
} }

View File

@ -61,12 +61,22 @@ const HORIZONTALMENUITEMS = [
{ {
state: '', state: '',
name: 'General Guidelines', name: 'Guidelines',
type: 'link', type: 'link',
icon: 'lock' icon: 'lock'
}, },
{ {
state: 'authentication', state: '',
name: 'My Account',
type: 'sub',
icon: 'lock',
children: [
{state: 'user-profile', name: 'My Account'},
{state: '', name: 'Log Out'}
]
},
{
state: 'login',
name: 'Login', name: 'Login',
type: 'link', type: 'link',
icon: 'lock' icon: 'lock'

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB