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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-10-27 15:35:26 +01:00
parent 6e8cd18a5f a36657bb8c
commit a52f9ff5b1
26 changed files with 238 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+12 -5
View File
@@ -32,19 +32,21 @@
<button (click)="back()" class="btn-no-color" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
</button>
</div>
<!-- Move forward one screen of the slides -->
<h2 class="capitaliseText d-flex align-center">
{{ viewTitle }}
{{ viewTitle }}
<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>
</div>
</h2>
<div class="dropdown-scroll-weel" *ngIf="dropdownScrollWeal" >
@@ -86,7 +88,7 @@
</ul>
</div>
</div>
<div *ngIf="dropdownScrollWeal" class="dropdown-scroll-weel-background" (click)="dropdownScrollWeal = false">
</div>
@@ -103,6 +105,7 @@
<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>
</div>
</ion-row>
@@ -119,11 +122,13 @@
<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 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>
</button>
</ion-row>
@@ -187,11 +192,12 @@
<button class="btn-no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-up.svg" ></ion-icon>
</button>
<button class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='320px';showCalendar=true">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-down.svg" ></ion-icon>
</button >
@@ -205,6 +211,7 @@
<button (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
<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>
</button>
<!-- List -->
@@ -438,7 +445,7 @@
(closeEventToApprove)="closeEventToApproveGoBack()"
></app-edit-event-to-approve>
<!-- View -->
<app-view-event *ngIf="mobileComponent.showEventDetails"
src/app/pages/events/events.page.html
+14
View File
@@ -47,6 +47,13 @@
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'tribunal' "
class="icon-next"
slot="end"
src="assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
@@ -107,6 +114,13 @@
slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'tribunal' "
class="icon-next"
slot="end"
src="assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
src/app/pages/events/events.page.scss
+9 -4
View File
@@ -329,9 +329,12 @@ ion-toolbar{
.schedule {
max-width: 400px;
font-family: Roboto;
background-color: white;
box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);
border: solid 1px #e9e9e9;
//background-color: white;
background-color: var(--box-container-color);
//box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);
box-shadow: 0 0 10px 0 var(--box-border-color-shadow);
//border: solid 1px #e9e9e9;
border: solid 1px var(--box-border-color);
margin-bottom: 20px;
border-radius: 25px;
display: flex;
@@ -380,10 +383,12 @@ ion-toolbar{
//padding-bottom: 5px;
padding: 5px 20px 5px 20px;
background-color: transparent !important;
}
ion-list{
padding: 0px;
margin: 0px;
background-color: transparent !important;
.d-flex{
width: 100%;
display: flex;
@@ -397,8 +402,8 @@ ion-toolbar{
display: flex;
justify-content: space-between;
align-items: center;
background-color: transparent !important;
--background: transparent !important;
.schedule-time{
margin-right: 10px;
.time-start{
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+2
View File
@@ -14,6 +14,7 @@
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="middle flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
@@ -22,6 +23,7 @@
<button class="btn-no-color" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+10 -9
View File
@@ -37,7 +37,7 @@
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
@@ -70,7 +70,7 @@
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
@@ -100,7 +100,8 @@ ion-button{
.label{
border-radius: 20px;
background: #ffb703;
//background: #ffb703;
background: var(--label-bg-color);
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
@@ -124,7 +125,7 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
@@ -166,7 +167,7 @@ ion-button{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
@@ -249,7 +250,7 @@ ion-button{
font-size: 13px;
color: black;
width: 100%;
}
.description{
font-family: Roboto;
@@ -271,7 +272,7 @@ ion-button{
padding-bottom: unset !important;
}
}
}
@@ -319,7 +320,7 @@ ion-button{
.option-desc {
display: flex;
color: #828282;
color: var(--profile-text-color) !important;
width: 100%;
justify-content: space-between;
align-items: center;
@@ -330,4 +331,4 @@ ion-button{
background-color: #e0e0e0;
padding-left: 4px;
}
}
}
src/app/pages/login/login.page.html
+5 -3
View File
@@ -8,16 +8,18 @@
<div class="bg-3 d-flex justify-center align-center">
<div class="bg-4 d-flex justify-center align-center">
<div class="div-logo">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/fullLogo.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'tribunal'" src='assets/images/theme/tribunal/tribunal-constitucional-logo.png' alt='logo'>
</div>
</div>
</div>
</div>
</div>
<h3 class="center text-white">Inicie a sessão</h3>
<h3 *ngIf="ThemeService.currentTheme != 'tribunal'"class="center text-white">Gabinete Digital</h3>
<h3 *ngIf="ThemeService.currentTheme == 'tribunal'" class="center text-white">Tribunal Constitucional</h3>
<form class="form">
<p class="form-label text-white">Email</p>
<ion-item class="form-input">
@@ -28,7 +30,7 @@
<ion-input (keyup.enter)="Login()" type="password" [(ngModel)]="password" name="input-password" ></ion-input>
</ion-item>
<div class="d-flex pt-25">
<button class="btn-ok btn-login" fill="clear" expand="block" shape="round" (click)="Login()">Iniciar</button>
<button class="btn-ok btn-login" fill="clear" expand="block" shape="round" (click)="Login()">Iniciar a sessão</button>
</div>
</form>
<div class="msg-bottom d-flex">
src/app/pages/login/login.page.scss
+9 -5
View File
@@ -51,13 +51,14 @@ ion-content{
.bg-4{
width: 175px;
height: 175px;
overflow: auto;
overflow: hidden;
border-radius: 50%;
padding: 15px;
margin: auto;
.bg-4 img{
width: 100%;
overflow: hidden;
}
}
}
@@ -67,7 +68,8 @@ ion-content{
width: 200px !important;
margin: 0 auto;
padding-bottom: 15px;
overflow: hidden;
}
.div-logo img{
width: 100%;
@@ -91,7 +93,7 @@ ion-item{
margin: 15px 0 5px 0;
font-size: 15px;
}
.form-input{
.form-input{
--background: #fff;
--color:#000;
border-radius: 22.5px;
@@ -100,9 +102,11 @@ ion-item{
.btn-login{
font-size: 16px;
background-color: #F2F2F2 !important;
color: #000;
}
.btn-login:hover{
background-color: var(--button-hover);;
background-color: var(--button-hover);
}
.div-top-header{
@@ -210,4 +214,4 @@ ion-item{
padding-top: 20px;
position: unset !important;
}
}
}