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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-15 11:39:30 +01:00
parent eba2b7f9ce a953230249
commit d96b5cfacd
1436 changed files with 2958 additions and 3769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/attachments/attachments.page.scss
+4 -2
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-back-button {
display: block;
}
@@ -14,7 +16,7 @@ ion-list, ion-item-sliding{
}
.item-list-small{
font-size: 14px;
font-size: rem(14);
overflow: auto;
}
.ion-item-class{
@@ -39,7 +41,7 @@ ion-list, ion-item-sliding{
padding: 10px;
}
.div-content-attachment h3{
font-size: 18px;
font-size: rem(18);
font-weight: 700;
padding-bottom: 5px;
}
src/app/pages/events/attendees/attendees.page.html
+14 -14
View File
@@ -15,9 +15,9 @@
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *ngIf="filterSearchList(attendee)" >
<div class="pr-10">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
</div>
<ion-label>
@@ -25,9 +25,9 @@
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
<div>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src="assets/images/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src="assets/images/theme/gov/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-add-25.svg" ></ion-icon>
</div>
</ion-item>
</div>
@@ -41,16 +41,16 @@
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
<div class="pr-10">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
<div class="cursor-pointer" (click)="remove(attendee)">
<ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
<ion-icon class="font-35-rem" src="assets/images/icons-delete-25.svg"></ion-icon>
</div>
</ion-item>
</ion-item-sliding>
@@ -62,9 +62,9 @@
<ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex">
<div class="pr-10">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
</div>
<ion-label>
@@ -72,7 +72,7 @@
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
<div class="cursor-pointer" (click)="remove(attendee)">
<ion-icon class="font-35" src="assets/images/icons-delete-25.svg"></ion-icon>
<ion-icon class="font-35-rem" src="assets/images/icons-delete-25.svg"></ion-icon>
</div>
</ion-item>
</ion-item-sliding>
src/app/pages/events/edit-event/edit-event.page.scss
+21 -20
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
.content{
padding: 30px 20px 0 20px !important;
@@ -24,12 +25,12 @@
}
.title{
font-size: 25px;
font-size: rem(25);
}
}
.ion-item-container{
margin: 15px auto;
margin: rem(15) auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 10px;
@@ -49,11 +50,11 @@
margin: 0px auto;
}
.ion-icon-class{
width: 45px;
height: 45px;
width: rem(45);
height: rem(45);
float: left;
padding: 10px;
font-size: 25px;
font-size: rem(25);
}
ion-select{
padding-left: 5px;
@@ -61,7 +62,7 @@
}
.ion-input-class{
width: calc(100% - 45px);
height: 45px;
height: rem(45);
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
@@ -79,19 +80,19 @@
}
.add-people{
width: 45px;
width: rem(45);
float: right;
overflow: auto;
font-size: 25px;
height: 45px;
font-size: rem(25);
height: rem(45);
display: flex;
}
.list-people-title{
/* font-size: 13px; */
/* font-size: rem(13); */
color: #797979;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -99,39 +100,39 @@
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color:var(--title-text-color);
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
.container-footer{
margin:0 auto;
overflow: auto;
}
.button-cancel {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #e0e9ee;
--color: #061b52;
margin:10px;
}
.button-save {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #42b9fe;
--color:#ffffff;
@@ -149,7 +150,7 @@
/* Error Messages */
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
src/app/pages/events/event-detail-modal/event-detail-modal.page.scss
+9 -7
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-item-group{
margin: 15px;
}
@@ -14,12 +16,12 @@ ion-item-group{
.div-up h3{
margin: 0;
padding: 0;
font-size: 17px;
font-size: rem(17);
width: 100%;
}
.div-icon{
width: 10%;
font-size: 22px;
font-size: rem(22);
float: left;
color: #808080;
}
@@ -35,7 +37,7 @@ ion-item-group{
}
.ion-icon-attach{
color: #666666;
font-size: 20px;
font-size: rem(20);
}
.btn-attach{
@@ -70,14 +72,14 @@ ion-card{
margin-bottom: 25px;
}
.ion-icon-delete{
font-size: 22px;
font-size: rem(22);
color: red;
background-color: white;
padding-right: 5px;
}
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
@@ -86,10 +88,10 @@ ion-card{
margin-top: 10px;
} */
.attendees-icon{
font-size: 14px;
font-size: rem(14);
}
.see-more-button{
text-transform: initial;
font-size: 16px;
font-size: rem(16);
}
src/app/pages/events/event-detail/event-detail.page.scss
+11 -9
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-item-group{
margin: 15px;
}
@@ -14,12 +16,12 @@ ion-item-group{
.div-up h3{
margin: 0;
padding: 0;
font-size: 17px;
font-size: rem(17);
width: 100%;
}
.div-icon{
width: 10%;
font-size: 22px;
font-size: rem(22);
float: left;
color: #808080;
}
@@ -35,7 +37,7 @@ ion-item-group{
}
.ion-icon-attach{
color: #666666;
font-size: 20px;
font-size: rem(20);
}
.btn-attach{
@@ -70,14 +72,14 @@ ion-card{
margin-bottom: 25px;
}
.ion-icon-delete{
font-size: 22px;
font-size: rem(22);
color: red;
background-color: white;
padding-right: 5px;
}
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
@@ -86,11 +88,11 @@ ion-card{
margin-top: 10px;
} */
.attendees-icon{
font-size: 14px;
font-size: rem(14);
}
.see-more-button{
text-transform: initial;
font-size: 16px;
font-size: rem(16);
}
.header-content{
@@ -100,7 +102,7 @@ ion-card{
}
.header-icon-left{
width: 36px;
font-size: 33px;
font-size: rem(33);
color: #42b9fe;
float: left;
border: 1px solid red;
@@ -108,7 +110,7 @@ ion-card{
.header-title{
width: 300px;
font-family: Roboto;
font-size: 25px;
font-size: rem(25);
margin: 0 5px 0 5px;
padding: 0;
color:#000;
src/app/pages/events/events.page.html
+15 -15
View File
@@ -28,22 +28,22 @@
<div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
<div class="px-20 pb-20 container-filters">
<p class="time ion-text-left ">{{customDate}}</p>
<p class="time ion-text-left font-18-em">{{customDate}}</p>
<div class="filters-box wrap d-flex float-left">
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('ForToDay')">
<div class="event-box mr-20 pointer hideMobile font-14-em" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> -->
<p>Correspondências com prazo para hoje</p>
<span>{{ TaskService.deadline }}</span>
</div>
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('OverdueTasks')">
<div class="event-box mr-20 pointer hideMobile font-14-em" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> -->
<p>Correspondências em atraso</p>
<span>{{ TaskService.overdueTasks }}</span>
</div>
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('unread')">
<div class="event-box mr-20 pointer hideMobile font-14-em" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> -->
<p>Correspondências não lidas</p>
<span>{{ TaskService.unread }}</span>
@@ -52,17 +52,17 @@
<!-- ««««««««««««««««««««««««««««««««««««««««««««« -->
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('ForToDay')">
<div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> -->
<p>Correspondências com prazo para hoje <b>{{ TaskService.deadline }}</b></p>
</div>
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('OverdueTasks')">
<div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> -->
<p>Correspondências em atraso <b>{{ TaskService.overdueTasks }}</b></p>
</div>
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('unread')">
<div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> -->
<p>Correspondências não lidas <b>{{ TaskService.unread }}</b></p>
</div>
@@ -83,21 +83,21 @@
<button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon
*ngIf="ThemeService.currentTheme == 'default' "
class="icon-next"
class="icon-next font-35-rem"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next"
class="icon-next font-35-rem"
slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'doneIt' "
class="icon-next"
class="icon-next font-35-em"
slot="end"
src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg"
></ion-icon>
@@ -202,26 +202,26 @@
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
<div class="text">A sua agenda do dia</div>
<div class="font-size-20">A sua agenda do dia</div>
</div>
<button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
<button class="transparent--background" title="Ir para a sua Agenda" [routerLink]="['/home/agenda']">
<ion-icon
*ngIf="ThemeService.currentTheme == 'default' "
class="icon-next"
class="icon-next-color font-35-em"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next"
class="icon-next-color font-35-em"
slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'doneIt' "
class="icon-next"
class="icon-next-color font-35-em"
slot="end"
src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg"
></ion-icon>
src/app/pages/events/events.page.scss
+55 -37
View File
@@ -46,7 +46,7 @@ ion-toolbar{
border: 0!important;
.div-search{
font-size: 45px;
font-size: rem(45);
float: left;
margin: 0 0 0 10px
}
@@ -60,7 +60,7 @@ ion-toolbar{
width: 100%;
}
.div-profile{
font-size: 45px;
font-size: rem(45);
float: right;
margin-right: 10px;
}
@@ -75,14 +75,14 @@ ion-toolbar{
}
.header-large{
font-family: Arial, Helvetica, sans-serif;
font-size: 12.5pt;
font-size: rem(17);
/* font-weight: 600; */
background: transparent;
color: #ffffff;
}
.header-xsmall{
font-family: Arial, Helvetica, sans-serif;
font-size: 9.7pt;
font-size: rem(13);
font-weight: bold;
padding-bottom: 3.5px;
margin-bottom: 3.5px;
@@ -90,16 +90,16 @@ ion-toolbar{
background: transparent;
}
.header-medium{
font-size: 12pt;
font-size: rem(16);
text-align: left;
font-family: roboto;
background: transparent;
margin-right: 5px;
line-height: 25px;
line-height: rem(25);
}
.p-small{
font-size: 13pt;
font-size: rem(17);
margin-top: 13px;
color: var(--header-tab-text-white);
margin-right: 25px !important;
@@ -109,7 +109,7 @@ ion-toolbar{
/* CONTENT */
.item-list-small{
font-size: 14px;
font-size: rem(14);
overflow: auto;
}
.ion-item-class{
@@ -150,12 +150,12 @@ ion-toolbar{
.div-up h3{
margin: 0;
padding: 0;
font-size: 17px;
font-size: rem(17);
width: 100%;
}
.div-icon{
width: 10%;
font-size: 22px;
font-size: rem(22);
float: left;
color: #808080;
}
@@ -177,11 +177,11 @@ ion-toolbar{
padding: 0 0 0 12px;
}
.div-content-Oficial h3, .div-content-Pessoal h3{
font-size: 14pt;
font-size: rem(19);
/* border: 1px solid red; */
}
.div-content-Oficial p, .div-content-Pessoal p{
font-size: 12pt;
font-size: rem(16);
color: rgb(94, 92, 92);
padding: 0 !important;
margin: 0 !important;
@@ -199,7 +199,7 @@ ion-toolbar{
text-align: center;
display: block;
color: var(--subtitle-text-color);
font-size: 16px;
font-size: rem(16);
margin: 0 auto;
min-height: 19px;
}
@@ -220,7 +220,7 @@ ion-toolbar{
}
.ion-icon-attach{
color: #666666;
font-size: 20px;
font-size: rem(20);
}
/* NEW CSS FOR TOGGLE BUTTON */
.toggleBox{
@@ -247,7 +247,7 @@ ion-toolbar{
position: absolute;
content: "";
left: 0;
width: 30px;
width: rem(30);
height: 30px;
background: #fff;
border-radius: 50%;
@@ -270,7 +270,7 @@ ion-toolbar{
position: absolute;
color: #fff;
font-weight: 600;
font-size: 12px;
font-size: rem(12);
pointer-events: none;
}
.onbtn{
@@ -298,18 +298,17 @@ ion-toolbar{
.event-number{
color: var(--header-tab-text-white);
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
bold{
font-family: Roboto;
font-size: 25px;
font-size: rem(25);
text-align: right;
color: var(--white);
}
}
.time{
font-family: Roboto;
font-size: 18pt;
text-align: center;
color: var(--header-tab-text-white);
line-height: unset;
@@ -334,7 +333,7 @@ ion-toolbar{
.meeting-description {
margin-top: 2px;
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
color: var(--header-tab-text-white);
}
}
@@ -374,22 +373,22 @@ ion-toolbar{
.icon{
color: #e8e8e8;
height: 35px;
width: 35px;
height: rem(35);
width: rem(35);
margin-right: 10px;
}
.text{
font-family: Roboto;
font-size: 20px;
font-size: rem(20);
color: black;
}
}
.icon-next {
color: #e8e8e8;
height: 35px;
width: 35px;
font-size: 35px;
font-size: 35px;
font-size: rem(35);
}
.icon-next-color {
color: #e8e8e8;
}
}
.content{
@@ -428,18 +427,18 @@ ion-toolbar{
.time-start{
color: #797979 !important;
font-family: Roboto;
font-size: 13px;
font-size: rem(13);
}
.time-end{
color: #797979 !important;
font-family: Roboto;
font-size: 13px;
font-size: rem(13);
}
}
.schedule-date{
margin-right: 10px;
color: #797979 !important;
font-size: 13px;
font-size: rem(13);
}
.schedule-details{
display: flex;
@@ -450,7 +449,7 @@ ion-toolbar{
align-items: baseline;
.location{
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
color: black;
min-height: 19px;
width: 100%;
@@ -459,7 +458,7 @@ ion-toolbar{
.description{
width: 100%;
font-family: Roboto;
font-size: 13px;
font-size: rem(13);
font-weight: bold;
//color: #0d89d1;
color: var(--title-text-color)
@@ -472,7 +471,7 @@ ion-toolbar{
}
.color{
width: 5px;
height: 40px;
height: rem(40);
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
background-color: #f05d5e;
@@ -489,7 +488,7 @@ ion-toolbar{
.resume{
.title{
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
font-weight: 500;
color: #797979;
margin-bottom: 5px;
@@ -497,7 +496,7 @@ ion-toolbar{
}
.event-num, .first-event-time{
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
display: block;
color: black;
}
@@ -606,6 +605,8 @@ ion-title{
width: 150px;
height: 90px;
margin:5px;
margin-left: 0px;
margin-right: 0px;
flex-direction: column;
display: flex;
justify-content: space-between;
@@ -616,12 +617,11 @@ ion-title{
-o-border-radius: 10px;
padding: 10px;
p{
font-size: 14px;
margin-bottom: 5px;
line-height: 15px;
}
span {
font-size: 15px;
font-size: rem(15);
font-weight: 600;
}
}
@@ -678,3 +678,21 @@ ion-title{
.event-box-content {
justify-content: flex-start !important;
}
@media only screen and (min-width: 100px) {
.container-filters, .filters-box, .schedule-header, .Goto-agenda{
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
.container-filters, .filters-box, .schedule-header, .Goto-agenda {
font-size: 16px;
}
}