peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +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:
Eudes Inácio
2021-10-25 15:32:59 +01:00
parent 5a569129d3 032042635d
commit ef67098948
30 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/chat-options-features/chat-options-features.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/modals/chat-options-features/chat-options-features.page.scss
+1 -1
View File
@@ -39,7 +39,7 @@
width: 100% !important;
}
.btn-cancel:hover{
background-color: #42b9fe;
background-color: var(--button-hover);
color: #fff !important;
}
.mobile-only{
src/app/modals/chat-options-features/chat-options-features.page.ts
+1
View File
@@ -9,6 +9,7 @@ import { ChatService } from 'src/app/services/chat.service';
import { FileLoaderService } from 'src/app/services/file/file-loader.service';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { environment } from 'src/environments/environment';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-options-features',
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="wrapper">
<div class="arrow-right" (click)="closePopover()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+3 -1
View File
@@ -8,6 +8,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
import { Location } from '@angular/common';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-event-actions-popover',
@@ -26,7 +27,8 @@ export class EventActionsPopoverPage implements OnInit {
private popoverController: PopoverController,
private animationController: AnimationController,
private toastService: ToastService,
private location: Location) {
private location: Location,
public ThemeService: ThemeService) {
this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('InstanceId');
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -24,7 +24,7 @@
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div >
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
-1
View File
@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { momentG } from 'src/plugin/momentG';
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+2 -1
View File
@@ -10,7 +10,8 @@
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div class="header-icon-right cursor-pointer" (click)="editar(loadedEvent.serialNumber)">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
</div>
</div>
</ion-header>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+2 -1
View File
@@ -14,7 +14,8 @@
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
</div>
<div class="menu-ptions">
<button class="btn-no-color" (click)="openOptions(loadedEvent)">
src/app/pages/publications/publications.page.html
+6 -2
View File
@@ -62,7 +62,9 @@
<ion-item-options class="members-options" side="end">
<ion-item-option class="edit-option" (click)="editAction(viagem.ProcessId)">
<button class="btn-no-color">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/cons-edit.svg" ></ion-icon>
</button>
</ion-item-option>
<ion-item-option class="delete-option" (click)="deleteAction(viagem.ProcessId)">
@@ -96,7 +98,9 @@
<ion-item-options class="members-options" side="end">
<ion-item-option class="edit-option" (click)="editAction(evento.ProcessId)">
<button class="btn-no-color">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
</button>
</ion-item-option>
<ion-item-option class="delete-option" (click)="deleteAction(evento.ProcessId)">
src/app/shared/agenda/approve-event/approve-event.page.html
+3 -1
View File
@@ -27,7 +27,9 @@
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
<button class="btn-no-color">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
</button>
</div>
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+1 -1
View File
@@ -1,6 +1,6 @@
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<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/assets/images/theme/gov/icons-calendar-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>
</button>
</div>
src/app/shared/popover/actions-options/actions-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/actions-options/actions-options.page.ts
+3 -1
View File
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-actions-options',
@@ -16,7 +17,8 @@ export class ActionsOptionsPage implements OnInit {
private modalController: ModalController,
private navParams: NavParams,
private publicationsService: PublicationsService,
private toastService: ToastService
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.id = this.navParams.get('id');
}
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+2
View File
@@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AlertService } from 'src/app/services/alert.service';
import { environment } from 'src/environments/environment';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-options-popover',
@@ -23,6 +24,7 @@ export class ChatOptionsPopoverPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private navParams: NavParams,
public ThemeService: ThemeService
) {
this.members = this.navParams.get('members');
src/app/shared/popover/chat-popover/chat-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close('cancel')">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/chat-popover/chat-popover.page.scss
+1 -1
View File
@@ -37,7 +37,7 @@
margin-bottom: 10px !important;
}
.btn-cancel:hover, .btn-delete:hover{
background-color: #42b9fe;
background-color: var(--button-hover);
color: #fff !important;
}
.btn-ok{
src/app/shared/popover/chat-popover/chat-popover.page.ts
+3
View File
@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-popover',
@@ -18,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
private navParams: NavParams,
private chatService: ChatService,
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.roomId = this.navParams.get('roomId');
}
src/app/shared/popover/despachos-options/despachos-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/despachos-options/despachos-options.page.ts
+2
View File
@@ -10,6 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { ToastService } from 'src/app/services/toast.service';
import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
@@ -31,6 +32,7 @@ export class DespachosOptionsPage implements OnInit {
private navParams: NavParams,
private toastService: ToastService,
public p: PermissionService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+3
View File
@@ -10,6 +10,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-despachos-pr-options',
@@ -33,6 +35,7 @@ export class DespachosPrOptionsPage implements OnInit {
private toastService: ToastService,
private location: Location,
public p: PermissionService,
public ThemeService: ThemeService
) { }
ngOnInit() {
src/app/shared/popover/messages-options/messages-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/messages-options/messages-options.page.ts
+3
View File
@@ -1,6 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-messages-options',
@@ -16,6 +18,7 @@ export class MessagesOptionsPage implements OnInit {
private modalController: ModalController,
private chatService: ChatService,
private navParams: NavParams,
public ThemeService: ThemeService
)
{
this.roomId = this.navParams.get('roomId');
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html
+2 -1
View File
@@ -2,7 +2,8 @@
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+3
View File
@@ -13,6 +13,8 @@ import { AuthService } from 'src/app/services/auth.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-opts-expediente-pr',
@@ -49,6 +51,7 @@ export class OptsExpedientePrPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
private location: Location,
public ThemeService: ThemeService
) {
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container width-100 ">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="width-100">
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+4 -1
View File
@@ -16,6 +16,8 @@ import { Location } from '@angular/common';
import { TaskService } from 'src/app/Rules/task.service'
import { ExpedienteService } from 'src/app/Rules/expediente.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-opts-expediente',
@@ -45,7 +47,8 @@ export class OptsExpedientePage implements OnInit {
private attachmentsService: AttachmentsService,
private location: Location,
private TaskService: TaskService,
private expedienteService: ExpedienteService
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
src/theme/variables.scss
+3 -3
View File
@@ -536,7 +536,7 @@ $app-theme: mat-light-theme(
height: 45px !important;
padding: 0 !important;
border-radius: 22.5px;
background-color: #e0e9ee;
background-color: #ffb703;
color: #061b52 !important;
margin: 0 auto !important;
}
@@ -619,7 +619,7 @@ body {
.gov {
--ion-color-primary: #000;
--login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important;
--button-hover: #ffb81c;
--button-hover: #c63527;
--inicio-open-page-from-box: #c63527;
--header-tab-top-border: #000;
@@ -661,7 +661,7 @@ body {
.default {
--ion-color-primary: #3880ff;
--login-background: linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !important;
--button-hover: #bfcbd1;
--button-hover: #42b9fe;
--inicio-open-page-from-box: #42b9fe;
--header-tab-top-border: white;