Merge branch 'master' of bitbucket.org:venbainformationtechnology/appointments_frontend

This commit is contained in:
bitbucket 2023-02-25 11:57:14 +05:30
commit 58ba1b4db3
5 changed files with 38 additions and 22 deletions

View File

@ -11,16 +11,16 @@ export interface UsersData {
picker: string; picker: string;
} }
const ELEMENT_DATA: UsersData[] = [ const ELEMENT_DATA: UsersData[] = [
{id: 1, serviceselect: 'school management system ', customerselect: 'A', picker: '22/02/2023' }, {id: 1, serviceselect: 'school management system ', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z' },
{id: 2, serviceselect: 'Sample', customerselect: 'B', picker: '22/02/2023' }, {id: 2, serviceselect: 'Sample', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z' },
{id: 3, serviceselect: 'Test', customerselect: 'C', picker: '22/02/2023' }, {id: 3, serviceselect: 'Test', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z' },
{id: 4, serviceselect: 'Sample', customerselect: 'A', picker: '22/02/2023' }, {id: 4, serviceselect: 'Sample', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z' },
{id: 5, serviceselect: 'Test', customerselect: 'B', picker: '22/02/2023' }, {id: 5, serviceselect: 'Test', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z' },
{id: 6, serviceselect: 'Sample', customerselect: 'C', picker: '22/02/2023'}, {id: 6, serviceselect: 'Sample', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z'},
{id: 7, serviceselect: 'Test', customerselect: 'A', picker: '22/02/2023'}, {id: 7, serviceselect: 'Test', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z'},
{id: 8, serviceselect: 'Sample', customerselect: 'B', picker: '22/02/2023'}, {id: 8, serviceselect: 'Sample', customerselect: 'B', picker: '2023-02-26T11:26:30.882Z'},
{id: 9, serviceselect: 'Test', customerselect: 'C', picker: '22/02/2023'}, {id: 9, serviceselect: 'Test', customerselect: 'C', picker: '2023-02-26T11:26:30.882Z'},
{id: 10, serviceselect: 'Sample', customerselect: 'A', picker: '22/02/2023'}, {id: 10, serviceselect: 'Sample', customerselect: 'A', picker: '2023-02-26T11:26:30.882Z'},
]; ];
@Component({ @Component({
selector: 'app-appoinments-list', selector: 'app-appoinments-list',

View File

@ -21,10 +21,9 @@ export class DialogBoxComponent implements OnInit {
serviceselect = new FormControl('', [Validators.required]); serviceselect = new FormControl('', [Validators.required]);
selects = [ selects = [
{name: 'A'}, {name: 'school management system'},
{name: 'B'}, {name: 'Sample'},
{name: 'C'}, {name: 'Test'},
{name: 'D'},
]; ];
customerselect = new FormControl('', [Validators.required]); customerselect = new FormControl('', [Validators.required]);

View File

@ -4,7 +4,7 @@
<form [formGroup]="form" (ngSubmit)="submit()"> <form [formGroup]="form" (ngSubmit)="submit()">
<div fxLayout="column" fxLayoutAlign="start stretch"> <div fxLayout="column" fxLayoutAlign="start stretch">
<!-- <mat-form-field> <mat-form-field>
<mat-select placeholder="Select Business" [formControl]="businessselect" required> <mat-select placeholder="Select Business" [formControl]="businessselect" required>
<mat-option>--</mat-option> <mat-option>--</mat-option>
<mat-option *ngFor="let business of selects" [value]="business.name"> <mat-option *ngFor="let business of selects" [value]="business.name">
@ -13,7 +13,7 @@
</mat-select> </mat-select>
<mat-error *ngIf="businessselect.hasError('required')">Please choose an animal</mat-error> <mat-error *ngIf="businessselect.hasError('required')">Please choose an animal</mat-error>
<mat-error *ngIf="businessselect.hasError('invalidValue')">Please choose any other</mat-error> <mat-error *ngIf="businessselect.hasError('invalidValue')">Please choose any other</mat-error>
</mat-form-field> --> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput type="text" placeholder="Enter Name" formControlName="bus_name" id="bus_name"> <input matInput type="text" placeholder="Enter Name" formControlName="bus_name" id="bus_name">
<mat-error *ngIf="myError('bus_name', 'required')">Name is required</mat-error> <mat-error *ngIf="myError('bus_name', 'required')">Name is required</mat-error>

View File

@ -3,7 +3,7 @@
<!-- <button class="btn btn-primary pull-right" (click)="addEvent()"> <!-- <button class="btn btn-primary pull-right" (click)="addEvent()">
Add new Add new
</button> --> </button> -->
<button class="btn btn-primary pull-right" mat-raised-button color="primary">Add Appoinment</button> <button class="btn btn-primary pull-right" mat-raised-button color="primary">Add Appoinment</button> -->
<div class="clearfix"></div> <div class="clearfix"></div>
</h3> </h3>
<mat-toolbar color="primary"> <mat-toolbar color="primary">

View File

@ -115,6 +115,7 @@ export class CalendarListComponent implements OnInit {
console.log( this.yesterday ) console.log( this.yesterday )
} }
private initializeEvents() { private initializeEvents() {
let date = new Date("2023-02-26T11:26:30.882Z")
this.events = [ this.events = [
{ {
title: 'Editable event', title: 'Editable event',
@ -129,6 +130,19 @@ export class CalendarListComponent implements OnInit {
}, },
], ],
}, },
{
title: 'Editable event',
color: colors.yellow,
start: date,
actions: [
{
label: '<i class="fa fa-fw fa-pencil"></i>',
onClick: ({ event }: { event: CalendarEvent }): void => {
console.log('Edit event', event);
},
},
],
},
{ {
title: 'Deletable event', title: 'Deletable event',
color: colors.blue, color: colors.blue,
@ -153,7 +167,8 @@ export class CalendarListComponent implements OnInit {
} }
dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void { dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void {
console.log(date, events)
this.addEvent(date)
if (isSameMonth(date, this.viewDate)) { if (isSameMonth(date, this.viewDate)) {
if ( if (
(isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) || (isSameDay(this.viewDate, date) && this.activeDayIsOpen === true) ||
@ -184,12 +199,14 @@ export class CalendarListComponent implements OnInit {
}); });
} }
addEvent(): void { addEvent(dates): void {
console.log(startOfDay); console.log(startOfDay(new Date()));
console.log(endOfDay(new Date()))
this.events.push({ this.events.push({
title: 'New event', title: 'New event',
start: startOfDay(new Date()), // start: startOfDay(new Date()),
end: endOfDay(new Date()), start: startOfDay(new Date(dates)),
end: endOfDay(new Date(dates)),
color: colors.red, color: colors.red,
draggable: true, draggable: true,
resizable: { resizable: {