mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Add customization and calendar Pr vision
This commit is contained in:
Generated
-3
@@ -3072,14 +3072,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
|
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
|
||||||
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
|
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
"@types/date-fns": {
|
"@types/date-fns": {
|
||||||
"version": "0.0.2",
|
"version": "0.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz",
|
||||||
"integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w="
|
"integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w="
|
||||||
},
|
},
|
||||||
=======
|
|
||||||
>>>>>>> 662e62a926fd922d43a5b9de69a7aabbcdaee977
|
|
||||||
"@types/glob": {
|
"@types/glob": {
|
||||||
"version": "7.1.3",
|
"version": "7.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
|
||||||
|
|||||||
@@ -20,14 +20,14 @@
|
|||||||
|
|
||||||
<!-- Move forward one screen of the slides -->
|
<!-- Move forward one screen of the slides -->
|
||||||
<h2 class="capitaliseText">{{ viewTitle }}</h2>
|
<h2 class="capitaliseText">{{ viewTitle }}</h2>
|
||||||
<div class="drop-down">
|
<!-- <div class="drop-down">
|
||||||
<ion-icon slot="icon-only" class="arrow-down" src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
|
<ion-icon slot="icon-only" class="arrow-down" src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
|
||||||
<div class="drop-down-container">
|
<div class="drop-down-container">
|
||||||
<ul>
|
<ul>
|
||||||
<li *ngFor="let month of monthList" (click)="dropDownChangeDate(month.id)" >{{ month.name }}</li>
|
<li *ngFor="let month of monthList" (click)="dropDownChangeDate(month.id)" >{{ month.name }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div> -->
|
||||||
<!-- Move forward one screen of the slides -->
|
<!-- Move forward one screen of the slides -->
|
||||||
<div (click)="next()" class="arrow">
|
<div (click)="next()" class="arrow">
|
||||||
<ion-icon slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
|
<ion-icon slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
</ion-row>
|
</ion-row>
|
||||||
<ion-row class="ion-align-items-center">
|
<ion-row class="ion-align-items-center">
|
||||||
<ion-icon class="right-icons" name="add-circle-outline"></ion-icon>
|
<ion-icon class="right-icons" (click)="changeProfile()" name="add-circle-outline"></ion-icon>
|
||||||
<ion-icon class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
|
<ion-icon class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
|
||||||
<ion-icon class="right-icons" src="assets/images/icons-add-new-event.svg" (click)="openCalModal()" ></ion-icon>
|
<ion-icon class="right-icons" src="assets/images/icons-add-new-event.svg" (click)="openCalModal()" ></ion-icon>
|
||||||
</ion-row>
|
</ion-row>
|
||||||
@@ -174,6 +174,17 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Calendar currente date -->
|
||||||
|
<ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
|
||||||
|
<ion-row class="timeline-date">
|
||||||
|
<span *ngIf="timelineIsCurrentDate()">Hoje, </span> {{ timelineDate }}
|
||||||
|
</ion-row>
|
||||||
|
<!-- <ion-row class="filter ion-align-items-center">
|
||||||
|
<div class="filter-name">Todos</div>
|
||||||
|
<ion-icon class="arrow-down" src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
|
||||||
|
</ion-row> -->
|
||||||
|
</ion-row>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -187,18 +198,6 @@
|
|||||||
</ion-refresher-content>
|
</ion-refresher-content>
|
||||||
</ion-refresher>
|
</ion-refresher>
|
||||||
|
|
||||||
<!-- Calendar currente date -->
|
|
||||||
|
|
||||||
<ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
|
|
||||||
<ion-row class="timeline-date">
|
|
||||||
Hoje, {{ timelineDate }}
|
|
||||||
</ion-row>
|
|
||||||
<ion-row class="filter ion-align-items-center">
|
|
||||||
<div class="filter-name">Todos</div>
|
|
||||||
<ion-icon class="arrow-down" src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
|
|
||||||
</ion-row>
|
|
||||||
</ion-row>
|
|
||||||
|
|
||||||
<!-- Timeline -->
|
<!-- Timeline -->
|
||||||
<div *ngIf="showTimeline">
|
<div *ngIf="showTimeline">
|
||||||
<mwl-demo-utils-calendar-header class="timeline"
|
<mwl-demo-utils-calendar-header class="timeline"
|
||||||
|
|||||||
@@ -389,19 +389,27 @@ label{
|
|||||||
|
|
||||||
|
|
||||||
.capitaliseText{
|
.capitaliseText{
|
||||||
min-width: 159px;
|
min-width: 155px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
font-weight: normal;
|
||||||
|
padding: 0px;
|
||||||
|
margin: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.arrow{
|
.arrow{
|
||||||
padding: 0px 6px;
|
padding: 0px 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.right-icons{
|
.right-icons{
|
||||||
padding: 0px 4px;
|
padding: 0px 9px
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.capitaliseText{
|
.capitaliseText{
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.calendar-tool-tip{
|
||||||
|
padding: 17px 10px 0px 10px;
|
||||||
|
}
|
||||||
@@ -97,7 +97,7 @@ export class AgendaPage implements OnInit {
|
|||||||
};
|
};
|
||||||
|
|
||||||
selectedDate: Date;
|
selectedDate: Date;
|
||||||
eventSelectedDate: Date;
|
eventSelectedDate: Date = new Date();
|
||||||
eventSelectedDate2: Date;
|
eventSelectedDate2: Date;
|
||||||
rangeStartDate: Date;
|
rangeStartDate: Date;
|
||||||
rangeEndDate: Date;
|
rangeEndDate: Date;
|
||||||
@@ -172,6 +172,9 @@ export class AgendaPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
timelineIsCurrentDate(): Boolean {
|
||||||
|
return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||||
|
}
|
||||||
|
|
||||||
//Go to the next view of the calendar month/week/day
|
//Go to the next view of the calendar month/week/day
|
||||||
next(){
|
next(){
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ td.monthview-current{
|
|||||||
/* display: flex; */
|
/* display: flex; */
|
||||||
height: 100%;
|
height: 100%;
|
||||||
div {
|
div {
|
||||||
|
padding-left: 7px;
|
||||||
border-radius: 28px;
|
border-radius: 28px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -67,6 +68,7 @@ td.monthview-selected {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.calendar-event-type
|
.calendar-event-type
|
||||||
|
|
||||||
/* Timeline */
|
/* Timeline */
|
||||||
|
|
||||||
.cal-hour-segment {
|
.cal-hour-segment {
|
||||||
|
|||||||
Reference in New Issue
Block a user