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

Merge branch 'themesDeveloper' of https://bitbucket.org/equilibriumito/gabinete-digital into themesDeveloper

Browse Source
This commit is contained in:
tiago.kayaya
2021-10-27 15:11:30 +01:00
parent f38e387879 a6e4b12408
commit 1904804f3a
83 changed files with 1216 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+5 -5
View File
@@ -22,7 +22,7 @@
<!-- Calendar is here -->
<div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="loggeduser.Profile =='PR'">
<div class="calendar-container" [style.height]="calendarHeight">
<div class="calendar-container" [style.height]="calendarHeight ">
<ion-row class="ion-justify-content-between calendar-tool-tip">
<ion-row class="ion-align-items-center">
@@ -41,7 +41,7 @@
<h2 class="capitaliseText d-flex align-center">
{{ viewTitle }}
<div (click)="dropdownScrollWeal = true; onDropDownScrollWeal()">
<div (click)="dropdownScrollWeal = true; onDropDownScrollWeal()" class="cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
@@ -102,7 +102,7 @@
</div>
</div> -->
<!-- Move forward one screen of the slides -->
<div (click)="next()" class="arrow">
<div (click)="next()" class="arrow cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
@@ -119,13 +119,13 @@
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
<button class="btn-no-color cursor-pointer" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
</button>
<button class="btn-no-color cy-add-event" (click)="clearContact();openAddEvent();">
<button class="btn-no-color cy-add-event cursor-pointer" (click)="clearContact();openAddEvent();">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-add.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-add.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons" src="assets/images/theme/tribunal/icons-add.svg" ></ion-icon>
src/app/pages/agenda/agenda.page.scss
+33 -14
View File
@@ -284,8 +284,6 @@ td.monthview-primary-with-event {
height: 100%;
font-family: Roboto;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
/* padding: 25px 20px 0 20px; */
@@ -572,12 +570,6 @@ td.monthview-primary-with-event {
}
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 25px;
}
.calendar-border{
background: #ebebeb;
@@ -602,7 +594,7 @@ td.monthview-primary-with-event {
overflow: hidden;
.calendar-timeline{
border-top-right-radius: 24px;
border-top-right-radius: 0px;
width: calc(100%);
overflow: hidden;
@@ -618,11 +610,6 @@ td.monthview-primary-with-event {
}
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 25px;
}
.event-details{
@@ -636,6 +623,7 @@ td.monthview-primary-with-event {
.calendar-timeline{
border-top-right-radius: 0px;
border-top-left-radius: 25px;
width: calc(100% - 40%);
border-right: 1px solid #d8d8d8;
@@ -769,4 +757,35 @@ app-approve-event{
height: 100%;
width: 100%;
z-index: 99;
}
@media only screen and (min-width: 1225px) {
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 25px;
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 0px;
}
}
@media only screen and (min-width: 321px) {
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 0px;
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 25px;
}
}
src/app/pages/agenda/edit-event/edit-event.page.html
-1
View File
@@ -275,7 +275,6 @@
<span class="app-name span-left" *ngIf="document.ApplicationId == 386"> Acções Presidenciais </span>
<span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
<!-- <span class="span-right" *ngIf="document.CreateDate"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span> -->
</p>
</ion-label>
</ion-item>
src/app/pages/agenda/new-event/new-event.page.html
+4 -4
View File
@@ -193,7 +193,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipants()" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -208,7 +208,7 @@
</ion-list>
</ion-item>
</div>
<div (click)="addParticipants()" class="add-people cursor-pointer">
<div class="add-people cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
@@ -221,7 +221,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipantsCC()">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -236,7 +236,7 @@
</ion-list>
</ion-item>
</div>
<div (click)="addParticipantsCC()" class="add-people cursor-pointer">
<div class="add-people cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>