peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improving agenda

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-16 09:11:20 +01:00
parent 9650255eee
commit b5fd1b4f23
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+4 -4
View File
@@ -121,7 +121,7 @@
<button class="btn-no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false"> <button class="btn-no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
<ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon> <ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
</button> </button>
<button class="collaps btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='333px';showCalendar=true"> <button class="collaps btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='330px';showCalendar=true">
<ion-icon src="assets/images/icons-collaps-down.svg" ></ion-icon> <ion-icon src="assets/images/icons-collaps-down.svg" ></ion-icon>
</button > </button >
@@ -213,7 +213,7 @@
</div> </div>
</div> --> </div> -->
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto" > <div class="ss-timeline hide-scroll timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto" >
<div *ngFor="let events of TimelineMDList | keyvalue;" > <div *ngFor="let events of TimelineMDList | keyvalue;" >
<div *ngIf="CalendarCurrentDay <= events.key"> <div *ngIf="CalendarCurrentDay <= events.key">
@@ -256,7 +256,7 @@
</div> </div>
</div> </div>
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'"> <div class="fs-timeline hide-scroll flex-grow-1 d-none d-md-block d-md-block text-black pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
<div *ngFor="let events of TimelineMDList | keyvalue;" > <div *ngFor="let events of TimelineMDList | keyvalue;" >
<div *ngIf="CalendarCurrentDay <= events.key"> <div *ngIf="CalendarCurrentDay <= events.key">
@@ -297,7 +297,7 @@
</div> </div>
</div> </div>
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" > <div class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
<div *ngFor="let events of TimelinePRList | keyvalue;"> <div *ngFor="let events of TimelinePRList | keyvalue;">
<div *ngIf="CalendarCurrentDay <= events.key"> <div *ngIf="CalendarCurrentDay <= events.key">
src/app/pages/agenda/agenda.page.scss
+10 -10
View File
@@ -8,17 +8,17 @@
} }
ion-slide{ ion-slide{
td{ td{
div { div {
padding-left: 7px; padding-left: 7px;
border-radius: 28px; border-radius: 28px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
text-align: center; text-align: center;
height: 25px; height: 25px;
}
} }
}
} }
:host ::ng-deep { :host ::ng-deep {
src/app/pages/agenda/agenda.page.ts
+1 -2
View File
@@ -162,7 +162,7 @@ export class AgendaPage implements OnInit {
this.loggeduser = authService.ValidatedUser; this.loggeduser = authService.ValidatedUser;
this.calendarHeight = "333px"; this.calendarHeight = "330px";
this.showCalendar = true; this.showCalendar = true;
this.timelineDate = momentG(new Date(),'dd MMMM yyyy'); this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
@@ -174,7 +174,6 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showEventList = true; this.mobileComponent.showEventList = true;
} }
} }
ngOnInit() { ngOnInit() {
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+1 -1
View File
@@ -192,7 +192,7 @@ export class BookMeetingModalPage implements OnInit {
modal.onDidDismiss().then((data) => { modal.onDidDismiss().then((data) => {
if(data){ if(data) {
data = data['data']; data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendees: EventPerson[] = data['taskParticipants'];
src/global.scss
+7 -2
View File
@@ -189,8 +189,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
border-radius: 106px; border-radius: 106px;
width: 30px !important;
height: 30px;
padding: 0px !important; padding: 0px !important;
div.day{ div.day{
padding: 0px !important; padding: 0px !important;
@@ -585,6 +583,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
div { div {
padding-left: 0px; padding-left: 0px;
} }
}
td div:not(.day) {
background-color: red;
width: 30px !important;
height: 30px;
} }
} }