Skip to content

Commit

Permalink
[FEAT] Affichage rendez-vous dans calendar
Browse files Browse the repository at this point in the history
  • Loading branch information
Landris18 committed Feb 26, 2024
1 parent 6da416a commit ed93712
Show file tree
Hide file tree
Showing 8 changed files with 210 additions and 232 deletions.
2 changes: 1 addition & 1 deletion src/app/layout/common/user/user.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#userActions="matMenu">
<button mat-menu-item>
<span class="flex flex-col leading-none">
<span>Signed in as</span>
<span>Connecté en tant que</span>
<span class="mt-1.5 text-md font-medium">{{user.email}}</span>
</span>
</button>
Expand Down
20 changes: 10 additions & 10 deletions src/app/mock-api/apps/calendar/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import * as moment from 'moment';
export const calendars = [
{
id : '1a470c8e-40ed-4c2d-b590-a4f1f6ead6cc',
title : 'Personal',
color : 'bg-teal-500',
title : 'Ready',
color : 'bg-yellow-500',
visible: true
},
{
id : '5dab5f7b-757a-4467-ace1-305fe07b11fe',
title : 'Work',
color : 'bg-indigo-500',
title : 'In progress',
color : 'bg-blue-500',
visible: true
},
{
id : '09887870-f85a-40eb-8171-1b13d7a7f529',
title : 'Appointments',
color : 'bg-pink-500',
title : 'Finished',
color : 'bg-green-500',
visible: true
}
];
Expand Down Expand Up @@ -61,11 +61,11 @@ export const events = [
calendarId : '1a470c8e-40ed-4c2d-b590-a4f1f6ead6cc',
title : 'Mom\'s Birthday',
description: '',
start : moment().date(8).startOf('day').toISOString(), // 8th of the current month at start of the day
end : moment().year(9999).endOf('year').toISOString(), // End of the times
duration : 0,
start : moment("2024-02-28", "YYYY-MM-DD").toISOString(), // 8th of the current month at start of the day
end : moment("2024-03-01", "YYYY-MM-DD").toISOString(), // End of the times
duration : null,
allDay : true,
recurrence : 'FREQ=YEARLY;INTERVAL=1'
recurrence : null
},
// Appointments
{
Expand Down
6 changes: 2 additions & 4 deletions src/app/modules/admin/apps/calendar/calendar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,18 @@
<div class="flex -mt-2 -mr-2 ml-10">

<!-- Non-recurring event -->
<ng-container *ngIf="!event.recurrence">
<!-- Edit -->
<!-- <ng-container *ngIf="!event.recurrence">
<button
mat-icon-button
(click)="changeEventPanelMode('edit', 'single')">
<mat-icon [svgIcon]="'heroicons_outline:pencil-alt'"></mat-icon>
</button>
<!-- Delete -->
<button
mat-icon-button
(click)="deleteEvent(event)">
<mat-icon [svgIcon]="'heroicons_outline:trash'"></mat-icon>
</button>
</ng-container>
</ng-container> -->

<!-- Recurring event -->
<ng-container *ngIf="event.recurrence">
Expand Down
Loading

0 comments on commit ed93712

Please sign in to comment.