Commit f7b8595a authored by achinta's avatar achinta

change : design

parent c8e0f93a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
<div class="boys_login_container"> <div class="boys_login_container">
<app-white-card [cardTextHeading]="'La Martiniere for Boys, Kolkata'" <app-white-card [cardTextHeading]="'La Martiniere for Boys, Kolkata'"
(emitWhiteCardClick)="selectedSchool('boys')" [cardLink]="loginUrl" [cardImg]="'./assets/image/b_logo.png'" /> (emitWhiteCardClick)="selectedSchool('boys')" [cardLink]="loginUrl" [isBoys]="true" [cardImg]="'./assets/image/b_logo.png'" />
<div class="color-boys"></div> <div class="color-boys"></div>
</div> </div>
</div> </div>
......
...@@ -17,17 +17,16 @@ ...@@ -17,17 +17,16 @@
<mat-radio-button value="EDITOR">Teacher</mat-radio-button> <mat-radio-button value="EDITOR">Teacher</mat-radio-button>
</mat-radio-group> </mat-radio-group>
<p>Enter your username and password to continue</p> <p>Enter your mobile number to continue</p>
<div class="mat_input_container" >
<div class="mat_input_container" [ngClass]="{'d-none': otpSend}" >
<mat-form-field class="full_width"> <mat-form-field class="full_width">
<span class="material-symbols-outlined" matPrefix> <span class="material-symbols-outlined" matPrefix>
person person
</span> </span>
<input class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #input <input class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #input
formControlName="phoneNo" /> formControlName="phoneNo" [readonly]="otpSend" [disabled]="otpSend" />
</mat-form-field> </mat-form-field>
<ng-container <ng-container
...@@ -38,7 +37,7 @@ ...@@ -38,7 +37,7 @@
digits.</span> digits.</span>
</ng-container> </ng-container>
</div> </div>
<app-rounded-button-full-width [buttonText]="'Send otp'" [enableThrottling]="true" <app-rounded-button-full-width [buttonText]="'Send OTP'" [enableThrottling]="true"
(onClickEventEmitter)="sendOtp()" [ngClass]="{'d-none': otpSend}"/> (onClickEventEmitter)="sendOtp()" [ngClass]="{'d-none': otpSend}"/>
<div class="mat_input_container" [ngClass]="{'d-none': !otpSend}" > <div class="mat_input_container" [ngClass]="{'d-none': !otpSend}" >
...@@ -58,7 +57,7 @@ ...@@ -58,7 +57,7 @@
</ng-container> </ng-container>
</div> </div>
<app-rounded-button-full-width [buttonText]="'Sign in'" [buttonIconName]="'login'" [enableThrottling]="true" <app-rounded-button-full-width [buttonText]="'Enter OTP'" [buttonIconName]="'login'" [enableThrottling]="true"
(onClickEventEmitter)="authenticate()" [ngClass]="{'d-none': !otpSend}" /> (onClickEventEmitter)="authenticate()" [ngClass]="{'d-none': !otpSend}" />
</form> </form>
<!-- <div class="error_txt" *ngIf="errorMessage"> <!-- <div class="error_txt" *ngIf="errorMessage">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<p class="card_heading" *ngIf="cardTextHeading"> <p class="card_heading" *ngIf="cardTextHeading">
{{ cardTextHeading }} {{ cardTextHeading }}
</p> </p>
<div class="card_icon_direction"><span class="material-symbols-outlined"> <div class="card_icon_direction" [ngClass]="{'card_icon_direction_boys': isBoys}" ><span class="material-symbols-outlined">
north_east north_east
</span></div> </span></div>
<p class="card_paragraph" *ngIf="cardTextParagraph"> <p class="card_paragraph" *ngIf="cardTextParagraph">
......
...@@ -15,6 +15,7 @@ a { ...@@ -15,6 +15,7 @@ a {
align-items: center; align-items: center;
text-align: left; text-align: left;
gap: 20px; gap: 20px;
// .card_img{ // .card_img{
// img{ // img{
// height: 80px; // height: 80px;
...@@ -36,9 +37,15 @@ a { ...@@ -36,9 +37,15 @@ a {
// margin-top: 10px; // margin-top: 10px;
// margin-bottom: 18px; // margin-bottom: 18px;
} }
.card_icon_direction { .card_icon_direction {
padding: 10px; padding: 10px;
background: yellow; background: var(--accent-color);
border-radius: 50%; border-radius: 50%;
color: white;
}
.card_icon_direction_boys {
background: yellow;
color: black;
} }
} }
\ No newline at end of file
...@@ -19,6 +19,8 @@ export class WhiteCardComponent { ...@@ -19,6 +19,8 @@ export class WhiteCardComponent {
@Input() cardTextIcon: string = ''; @Input() cardTextIcon: string = '';
@Input() cardLink: string = ''; @Input() cardLink: string = '';
@Input() cardImg: string = ''; @Input() cardImg: string = '';
@Input() isBoys: boolean = false;
@Output() emitWhiteCardClick: EventEmitter<null> = new EventEmitter<null>(); @Output() emitWhiteCardClick: EventEmitter<null> = new EventEmitter<null>();
} }
...@@ -76,15 +76,13 @@ export class AssignmentComponent implements OnInit { ...@@ -76,15 +76,13 @@ export class AssignmentComponent implements OnInit {
} }
private _getAssignments(): void { private _getAssignments(): void {
// fieldName: assigned_on,assigned_on
// operators: gt,lt
// fieldValues: hhfj,nfw
let dateRangeFieldname = ''; let dateRangeFieldname = '';
let dateRangeFieldOperator = ''; let dateRangeFieldOperator = '';
let dateRangeFieldValue = ''; let dateRangeFieldValue = '';
if(this.range.value.start && this.range.value.end){ if(this.range.value.start && this.range.value.end){
dateRangeFieldname = 'assigned_on,assigned_on'; dateRangeFieldname = 'last_submission_date,last_submission_date';
dateRangeFieldOperator = 'ge,le'; dateRangeFieldOperator = 'ge,le';
dateRangeFieldValue = `${this._datePipe.transform(this.range.value.start,'yyyy-MM-dd')},${this._datePipe.transform(this.range.value.end,'yyyy-MM-dd')}` dateRangeFieldValue = `${this._datePipe.transform(this.range.value.start,'yyyy-MM-dd')},${this._datePipe.transform(this.range.value.end,'yyyy-MM-dd')}`
......
...@@ -32,7 +32,7 @@ export class PrepareAssignmentTableDataService { ...@@ -32,7 +32,7 @@ export class PrepareAssignmentTableDataService {
public prepareMatTableColumn(): CustomTableColumn[] { public prepareMatTableColumn(): CustomTableColumn[] {
let columnArray = [ let columnArray = [
{ key: 'section_details', label: 'Section' }, // { key: 'section_details', label: 'Section' },
{ key: 'subject', label: 'Subject' }, { key: 'subject', label: 'Subject' },
{ key: 'last_date', label: 'Last Date' }, { key: 'last_date', label: 'Last Date' },
{ key: 'action', label: 'Action' }, { key: 'action', label: 'Action' },
......
...@@ -93,7 +93,7 @@ export class Menu { ...@@ -93,7 +93,7 @@ export class Menu {
Menu.AssignmentItems, Menu.AssignmentItems,
Menu.RoutineItems, Menu.RoutineItems,
Menu.ExamItems, Menu.ExamItems,
Menu.ProfileItems // Menu.ProfileItems
]; ];
......
<div class="topbar_navigation_wrapper"> <div class="topbar_navigation_wrapper">
<div class="topbar_logo"> <div class="topbar_logo">
<!-- <button class="topbar_menu_button" (click)="toggleSidebar()"> <button class="topbar_menu_button" (click)="toggleSidebar()">
<span class="material-symbols-outlined"> <span class="material-symbols-outlined">
menu menu
</span> </span>
</button> --> </button>
<img <img
[ngSrc]="loggedSchoolLogo" [ngSrc]="loggedSchoolLogo"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="portal_dashboard_container"> <div class="portal_dashboard_container">
<div class="portal_dashboard_inner"> <div class="portal_dashboard_inner">
<div class="portal_card_container"> <div class="portal_card_container">
@if (authService.getUserRole() === 'student') { @if (authService.getUserRole() === 'student' && studentDropdown.length > 1) {
<div class="student_dropdown"> <div class="student_dropdown">
<mat-form-field class="full_width"> <mat-form-field class="full_width">
<mat-label >Select Student</mat-label> <mat-label >Select Student</mat-label>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
.portal_renderer .portal_renderer_inner { .portal_renderer .portal_renderer_inner {
width: 94%; width: 94%;
border-radius: 10px; border-radius: 10px;
padding: 20px 20px; padding: 20px 0px;
margin: 0 auto; margin: 0 auto;
} }
} }
......
...@@ -35,7 +35,7 @@ export class PrepareRoutineTableDataService { ...@@ -35,7 +35,7 @@ export class PrepareRoutineTableDataService {
let columnArray = [ let columnArray = [
// { key: 'class_details', label: 'Class' }, // { key: 'class_details', label: 'Class' },
{ key: 'section_details', label: 'Section' }, // { key: 'section_details', label: 'Section' },
{ key: 'details', label: 'Details' }, { key: 'details', label: 'Details' },
{ key: 'action', label: 'Action' }, { key: 'action', label: 'Action' },
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment