+
@@ -18,13 +18,15 @@
+ class="item-content flex-grow-1 cursor-pointer">
@@ -88,10 +92,16 @@
[class.item-active]="group._id ==idSelected"
class="item item-hover d-flex">
+ (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
{{group.name.split('-').join(' ')}}
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 9a19cdb15..8fff9beeb 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -38,8 +38,6 @@ ion-content{
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
- border-top-left-radius: 25px;
- border-top-right-radius: 25px;
overflow: auto;
@@ -101,7 +99,7 @@ ion-content{
width: calc(100% - 80px);
float: left;
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
}
.item-title-active{
color: #fff;
@@ -137,7 +135,7 @@ ion-content{
.item-active{
color: #fff !important;
- background-color: #42b9fe !important;
+ background-color: var(--gabinete-active-hove-background) !important;
}
@media only screen and (min-width: 701px) {
.main-content{
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 66c5d8a7e..cff860079 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -28,6 +28,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { environment } from 'src/environments/environment';
import { NotificationsService } from 'src/app/services/notifications.service';
import { TimeService } from 'src/app/services/functions/time.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-chat',
@@ -82,12 +84,6 @@ export class ChatPage implements OnInit {
@Output() getRoomInfo;
- /*
-
- Websockets variables
-
- */
-
subject: any;
public messages: Subject;
@@ -119,6 +115,7 @@ export class ChatPage implements OnInit {
private resolver: ComponentFactoryResolver,
private route: Router,
private timeService: TimeService,
+ public ThemeService: ThemeService
){
this.loggedUserChat = authService.ValidatedUserChat['data'];
this.headers = new HttpHeaders();
diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/pages/chat/edit-group/edit-group.page.html
index 7205ad17a..70817d9f6 100644
--- a/src/app/pages/chat/edit-group/edit-group.page.html
+++ b/src/app/pages/chat/edit-group/edit-group.page.html
@@ -4,7 +4,8 @@
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index ef5613387..49a5df6e8 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -6,6 +6,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-diplomas',
@@ -31,6 +33,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
private sortService: SortService,
+ public ThemeService: ThemeService
) {
//Inicializar segment
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index cf562b198..05ea1fc20 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -2,14 +2,16 @@
@@ -90,7 +92,7 @@
AccoesPresidenciais
ArquivoDespachoElect
-
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
index 2199dbb8a..6937abe54 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
@@ -97,7 +97,7 @@ ion-menu{
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
@@ -110,7 +110,7 @@ ion-menu{
.attach-title-item{
width: 100%;
font-size: 15px;
- color:#0d89d1;
+ color:var(--title-text-color);
}
/* SPAN */
.span-left{
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 3d0f93cf1..eb15015f1 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -16,6 +16,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { SqliteService } from '../../../../services/sqlite.service';
import { BackgroundService } from '../../../../services/background.service';
import { Platform } from '@ionic/angular';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-approve-event',
@@ -58,7 +60,8 @@ export class ApproveEventPage implements OnInit {
private location: Location,
private sqliteservice: SqliteService,
private platform: Platform,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService,
) {
this.activatedRoute.paramMap.subscribe(params => {
// console.log(params["params"]);
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 2f0e10e3d..cb2a24d8f 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -6,7 +6,8 @@
@@ -317,7 +319,8 @@
Anexar Documentos
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
index 24d21b73b..8d00c7cde 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
@@ -74,7 +74,7 @@
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index a563b56ee..7411339b3 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -19,6 +19,8 @@ import * as _moment from 'moment';
import * as _rollupMoment from 'moment';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { ThemeService } from 'src/app/services/theme.service'
+
const moment = _rollupMoment || _moment;
@@ -125,6 +127,7 @@ export class BookMeetingModalPage implements OnInit {
authService: AuthService,
private toastService: ToastService,
private activatedRoute: ActivatedRoute,
+ public ThemeService: ThemeService
) {
this.taskParticipants = [];
this.loggeduser = authService.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 3a830460c..baea578cf 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -133,7 +133,7 @@
-
diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/pages/chat/edit-group/edit-group.page.ts
index 4a9fd2a85..5d5c1d1f2 100644
--- a/src/app/pages/chat/edit-group/edit-group.page.ts
+++ b/src/app/pages/chat/edit-group/edit-group.page.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PickerController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-edit-group',
@@ -21,6 +22,7 @@ export class EditGroupPage implements OnInit {
private pickerController: PickerController,
private chatService: ChatService,
private navParams: NavParams,
+ public ThemeService: ThemeService
) {
this.roomId = this.navParams.get('roomId');
}
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
index 263363b7d..734643f4d 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -3,8 +3,9 @@
{{ task.Folio}}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index 9e023d87a..7cb38f87d 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -151,7 +151,7 @@ ion-button{
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 36fc4cc0f..270c49bca 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -1,19 +1,15 @@
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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { momentG } from 'src/plugin/momentG';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ActivatedRoute, Router } from '@angular/router';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-diploma-assinar',
@@ -44,6 +40,7 @@ export class DiplomaAssinarPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
private location: Location,
+ public ThemeService: ThemeService
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 76b0bd36e..b2d4bfe92 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -9,7 +9,7 @@
Diplomas
@@ -48,7 +48,8 @@
{{ task.Folio }}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 690222b2a..e9cfdf5ca 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -3,11 +3,12 @@ import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController, NavParams, Platform } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-diplomas-assinar',
@@ -33,7 +34,7 @@ export class DiplomasAssinarPage implements OnInit {
private alertService: AlertService,
private router: Router,
private sortService: SortService,
- ) {
+ public ThemeService: ThemeService) {
}
ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index 4e016a8a6..f70e98814 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -8,7 +8,8 @@
{{ task.Folio}}
@@ -17,7 +18,8 @@
- Diplomas
@@ -48,7 +48,8 @@
{{ task.Folio }}
@@ -84,7 +85,8 @@
{{ task.Folio }}
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index ea8205336..057ccf6ad 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -6,6 +6,7 @@ import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { NewGroupPage } from '../../new-group/new-group.page';
import { GroupMessagesPage } from '../group-messages.page';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-group-contacts',
@@ -37,6 +38,7 @@ export class GroupContactsPage implements OnInit {
private chatService: ChatService,
private authService: AuthService,
private navParams: NavParams,
+ public ThemeService: ThemeService
)
{
this.loggedUser = authService.ValidatedUserChat['data'];
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index cdf628d87..2f0b9fc4c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -6,7 +6,7 @@
@@ -124,7 +125,8 @@
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 55922891b..0dfb1c570 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -19,6 +19,7 @@ import { environment } from 'src/environments/environment';
import { NewEventPage } from '../../agenda/new-event/new-event.page';
import { EventPerson } from 'src/app/models/eventperson.model';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-group-messages',
@@ -73,6 +74,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
private fileToBase64Service: FileToBase64Service,
private fileService: FileService,
private toastService: ToastService,
+ public ThemeService: ThemeService
) {
this.loggedUserChat = authService.ValidatedUserChat['data'];
this.isGroupCreated = true;
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index 7ae952e46..5dc48c889 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -2,9 +2,10 @@
{{ task.Folio }}
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 2b621b25f..80fa3d4be 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -20,6 +20,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-despachos-pr',
@@ -63,6 +64,7 @@ export class DespachosPrPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
private sortService: SortService,
+ public ThemeService: ThemeService
) {
this.loggeduser = authService.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index a938e4ed4..e4b35646b 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -8,13 +8,15 @@
{{ task.Folio}}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index 686e62d8f..1526a1154 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -91,7 +91,7 @@ ion-button{
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 8a3f01708..15312a34a 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -22,6 +22,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { SqliteService } from 'src/app/services/sqlite.service';
import { Platform } from '@ionic/angular';
import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-despacho',
@@ -59,7 +61,8 @@ export class DespachoPage implements OnInit {
public p: PermissionService,
private sqliteservice: SqliteService,
private platform: Platform,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService
) {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 59b84271b..24f45b51f 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -10,7 +10,7 @@
Despachos
@@ -24,7 +24,7 @@
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
index 2a49ee468..a4421e515 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss
@@ -133,7 +133,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
- color: #0d89d1;
+ color: var(--title-text-color);
padding-left: 3px;
.subject{
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index d55459f72..966c2deb1 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -7,6 +7,8 @@ import { SqliteService } from 'src/app/services/sqlite.service';
import { Platform } from '@ionic/angular';
import { isThisHour } from 'date-fns';
import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-despachos',
@@ -24,7 +26,8 @@ export class DespachosPage implements OnInit {
private despachoRule: DespachoService,
private sqliteservice: SqliteService,
private platform: Platform,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService
) {
}
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index e391b83e4..fc8bee16e 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -8,7 +8,8 @@
@@ -20,13 +20,14 @@
-
@@ -45,7 +45,8 @@
-
@@ -43,7 +43,8 @@
{{ task.Folio }}
-
Diplomas por Assinar
-
{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}
+{{document.Stakeholders}} {{document.CreateDate }}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss index c1a015535..347959730 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss @@ -82,7 +82,7 @@ ion-menu{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -95,7 +95,7 @@ ion-menu{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -180,7 +180,7 @@ display: none; .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index de4345992..3dc0df31b 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -12,6 +12,7 @@ import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ToastService } from 'src/app/services/toast.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-approve-event-modal', @@ -43,6 +44,7 @@ export class ApproveEventModalPage implements OnInit { private iab: InAppBrowser, private animationController: AnimationController, private toastService: ToastService, + public ThemeService: ThemeService ) { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 894359f57..28bbc19a8 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -7,17 +7,20 @@
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
index 79e97df02..80d8b217d 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss
@@ -115,7 +115,7 @@ ion-item-sliding{
font-style: normal;
line-height: normal;
letter-spacing: normal;
- color: #0d89d1;
+ color: var(--title-text-color) !important;
margin: 0;
padding: 0;
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 765450313..444e0e291 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -12,6 +12,7 @@ import { SqliteService } from '../../../services/sqlite.service';
import { BackgroundService } from '../../../services/background.service';
import { Platform } from '@ionic/angular';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-event-list',
@@ -42,7 +43,8 @@ export class EventListPage implements OnInit {
private sqliteservice: SqliteService,
private platform: Platform,
private sortService: SortService,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService
) { }
ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 25dbc352b..991323c85 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -266,7 +266,7 @@
-
+
@@ -275,8 +275,9 @@
-
@@ -297,7 +298,8 @@
-
+
-
+
@@ -142,8 +142,9 @@
-
@@ -154,7 +155,7 @@
-
-
+
+
@@ -163,17 +164,19 @@
-
-
-
+
+
Anexar Documentos
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index c082ed853..161e89228 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -78,7 +78,7 @@
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
}
.attach-title-item{
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 6e36b5227..66a2f128e 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -22,6 +22,8 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
import { task } from 'src/app/models/ExpedientTaskModalPage';
import { DespachoService } from 'src/app/Rules/despacho.service';
import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -106,7 +108,8 @@ export class ExpedientTaskModalPage implements OnInit {
private alertController: AlertService,
private userAuth: AuthService,
private toastService: ToastService,
- private despachoService: DespachoService
+ private despachoService: DespachoService,
+ public ThemeService: ThemeService
) {
this.loggeduser = userAuth.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 0b6798f7f..d827c28d3 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -12,14 +12,18 @@
{{ task.Folio}}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index c60efcf8a..4e0adc31b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -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,14 +125,14 @@ ion-button{
.bottom-content{
//width: 360px;
margin: 0 auto;
-
+
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
@@ -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;
}
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index bd547bae4..b7fdd30e7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -24,6 +24,7 @@ import { TaskService } from 'src/app/Rules/task.service';
import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
import { SqliteService } from 'src/app/services/sqlite.service';
@@ -75,7 +76,8 @@ export class ExpedienteDetailPage implements OnInit {
private expedienteService: ExpedienteService,
public platform: Platform,
private sqliteservice: SqliteService,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService
) {
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 41a32a4cb..fe345d4d2 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -7,7 +7,8 @@
@@ -43,7 +44,8 @@
{{ task.Subject }}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
index 9fcfa6835..f5085216c 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss
@@ -129,7 +129,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
- color: #0d89d1;
+ color: var(--title-text-color);
padding-left: 3px;
.subject{
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index a2fdf031d..21c9503fb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -7,6 +7,8 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
import { SqliteService } from 'src/app/services/sqlite.service';
import { Platform } from '@ionic/angular';
import { BackgroundService } from '../../../services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-expediente',
@@ -34,7 +36,8 @@ export class ExpedientePage implements OnInit {
private toastService: ToastService,
public platform: Platform,
private sqliteservice: SqliteService,
- private backgroundservice: BackgroundService
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService
) { }
ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index dee55234c..7e7fcfe71 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -12,14 +12,16 @@
{{ task.Folio}}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
index 2402864da..f0ff4a797 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
@@ -131,7 +131,7 @@ ion-button{
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 00159506b..bdf1e1646 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -20,6 +20,7 @@ import { SearchList } from 'src/app/models/search-document';
import { Location } from '@angular/common';
import { AttachmentList } from 'src/app/models/Excludetask';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-expediente-pr',
@@ -57,7 +58,8 @@ export class ExpedientePrPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
private attachmentsService: AttachmentsService,
- private location: Location
+ private location: Location,
+ public ThemeService: ThemeService
) {
this.loggeduser = userAuth.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 8098c5464..07c372c1a 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -10,7 +10,7 @@
Expediente
@@ -39,7 +39,8 @@
{{ task.Subject }}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 2ee19036a..f4da1f622 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -11,6 +11,8 @@ import { AuthService } from 'src/app/services/auth.service';
import { Location } from '@angular/common'
import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-expedientes-pr',
@@ -38,7 +40,8 @@ export class ExpedientesPrPage implements OnInit {
private alertService: AlertService,
private authService: AuthService,
private router: Router,
- private location: Location
+ private location: Location,
+ public ThemeService: ThemeService
) {
this.loggeduser = authService.ValidatedUser;
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 611a1f017..72057e5f5 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -8,7 +8,7 @@
-
-
@@ -15,7 +16,7 @@
-
+
@@ -109,7 +111,10 @@
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 2a232317f..4f3aea66d 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -97,7 +97,7 @@ ion-button{
}
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index a41a13c1a..a3bd8e8f7 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -25,6 +25,8 @@ import { BackgroundService } from 'src/app/services/background.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-pedido',
@@ -63,7 +65,8 @@ export class PedidoPage implements OnInit {
private pedidoService: PedidoService,
private sqliteservice: SqliteService,
private backgroundservices: BackgroundService,
- private platform: Platform
+ private platform: Platform,
+ public ThemeService: ThemeService
) {
this.loggeduser = authService.ValidatedUser;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 0b6ff7050..002b4a1ac 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -8,7 +8,7 @@
Pedidos
@@ -55,7 +55,8 @@
{{ task.Folio }}
@@ -92,7 +93,8 @@
{{ task.Folio }}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 1195faae0..aa7f23bfb 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -11,6 +11,8 @@ import { ModalService } from 'src/app/services/modal.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-pedidos',
@@ -49,7 +51,8 @@ export class PedidosPage implements OnInit {
private sqliteservice: SqliteService,
private sortService: SortService,
private backgroundservice: BackgroundService,
- private platform: Platform
+ private platform: Platform,
+ public ThemeService: ThemeService
) {
//Inicializar segment
this.segment = 'parecer';
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index 43af02c1b..63bd7008b 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -9,7 +9,7 @@
Pendentes
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index f802c4aed..391130886 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -8,13 +8,18 @@
-
@@ -18,7 +18,7 @@
Gabinete Digital
-
Expediente
{{expedientegbstore.count}} Documentos
@@ -118,7 +123,10 @@
-
Pendentes
Meus Pendentes
@@ -127,7 +135,10 @@
-
Despacho do Presidente da República
Despachos criados por mim
@@ -136,7 +147,10 @@
-
Despachos
{{despachoStore.count}} Documentos
@@ -144,7 +158,10 @@
-
Pedidos de Parecer
Pedidos de Parecer solicitados por mim
@@ -153,7 +170,10 @@
-
Pedidos de Deferimento
{{pedidosstore.countdeferimento}} Documentos
@@ -176,7 +196,10 @@Despacho do Presidente da República
@@ -187,7 +210,10 @@
-
Diplomas por Validar
Diplomas por Assinar
@@ -196,7 +222,10 @@
-
Diplomas assinados PR
Diplomas
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 20f96d556..718ba383c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -26,7 +26,7 @@ ion-segment-button{ text-align: center; } .title-container{ - background:#ecf8ff; + background:var(--gabinete-title-container); padding: 30px 20px 15px 20px !important; //margin-bottom: 15px; border-top-left-radius: 25px; @@ -117,11 +117,9 @@ ion-segment-button{ height: 100%; font-family: Roboto; margin: 0 auto; - background:#ecf8ff; + background:var(--gabinete-main-container); overflow:hidden; padding: 0 !important; - border-top-left-radius: 25px; - border-top-right-radius: 25px; .aside-wrapper{ overflow: hidden; @@ -201,12 +199,11 @@ ion-segment-button{ } .exp-card-title{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color);; font-family: Roboto; font-weight: bold; font-stretch: normal; font-style: normal; - color: #0d89d1; margin: 15px 0 0 10px; text-align: center; } @@ -272,7 +269,7 @@ ion-list{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .item-subject{ @@ -354,7 +351,7 @@ ion-list{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; @@ -560,8 +557,8 @@ ion-list{ .active { color: white !important; fill: white !important; - border: 1px solid #42b9fe !important; - background: #42b9fe !important; + border: var(--gabinete-active-hove-box-border) !important; + background: var(--gabinete-active-hove-background) !important; box-sizing: border-box; .exp-card-content, .icon-selected{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 31df012f0..d74544854 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -23,6 +23,7 @@ import { NotificationsService } from 'src/app/services/notifications.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { ThemeService } from 'src/app/services/theme.service' import { SqliteService } from '../../services/sqlite.service'; @@ -128,7 +129,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { private sqliteservice: SqliteService, private platform: Platform, private changeProfileService: ChangeProfileService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index dfc0d5016..b83ec04b7 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -8,7 +8,8 @@
-
@@ -16,7 +17,8 @@
- 
+
+
+ 
+ 
+
+
+
+
+
+
Inicie a sessão
+Gabinete Digital
+Tribunal Constitucional
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 103042085..39607a1b2 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -9,7 +9,7 @@ ion-content{
}
.main-wrapper{
- background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%) !important;
+ background: var(--login-background);
display: flex;
width: 100vw;
height: 100vh;
@@ -35,33 +35,30 @@ ion-content{
height: 250px;
overflow: auto;
border-radius: 50%;
- background: #4cb9f825;
margin: auto;
.bg-2{
width: 225px;
height: 225px;
overflow: auto;
border-radius: 50%;
- background: #61bdf2b4;
margin: auto;
.bg-3{
width: 200px;
height: 200px;
overflow: auto;
border-radius: 50%;
- background: #96d3f8be;
margin: auto;
.bg-4{
width: 175px;
height: 175px;
- overflow: auto;
+ overflow: hidden;
border-radius: 50%;
- background: rgba(255, 255, 255, 0.918);
padding: 15px;
margin: auto;
.bg-4 img{
width: 100%;
+ overflow: hidden;
}
}
}
@@ -71,7 +68,8 @@ ion-content{
width: 200px !important;
margin: 0 auto;
padding-bottom: 15px;
-
+ overflow: hidden;
+
}
.div-logo img{
width: 100%;
@@ -95,20 +93,21 @@ ion-item{
margin: 15px 0 5px 0;
font-size: 15px;
}
-.form-input{
+.form-input{
--background: #fff;
--color:#000;
border-radius: 22.5px;
margin: 10px 0 10px 0;
}
+
.btn-login{
font-size: 16px;
- }
-
-
-
-
-
+ background-color: #F2F2F2 !important;
+ color: #000;
+}
+.btn-login:hover{
+ background-color: var(--button-hover);
+}
.div-top-header{
margin: 0 em(20px);
@@ -128,7 +127,6 @@ ion-item{
}
-
.circle{
color: white;
width: 70px;
@@ -216,4 +214,4 @@ ion-item{
padding-top: 20px;
position: unset !important;
}
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index e83bae32f..411e03c07 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -9,6 +9,8 @@ import { NotificationsService } from 'src/app/services/notifications.service';
import { SessionStore } from 'src/app/store/session.service';
import { ClearStoreService } from 'src/app/services/clear-store.service';
import { ChangeProfileService } from 'src/app/services/change-profile.service';
+import { ThemeService } from 'src/app/services/theme.service';
+import { StorageService } from 'src/app/services/storage.service'
@Component({
selector: 'app-login',
@@ -35,12 +37,16 @@ export class LoginPage implements OnInit {
private toastService: ToastService,
public alertController: AlertController,
private clearStoreService: ClearStoreService,
- private changeProfileService: ChangeProfileService
- ) {
- }
+ private changeProfileService: ChangeProfileService,
+ public ThemeService: ThemeService,
+ private storageservice: StorageService
+ ) {}
ngOnInit() {
-
+ this.storageservice.get('theme').then((theme) =>{
+ console.log('LOGIN THEME',theme)
+ this.ThemeService.setTheme(theme)
+ })
}
//Function to validade the login inputs
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index d60a88c1b..c010cc1ad 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -57,7 +57,9 @@
Tirar Fotografia
@@ -66,11 +68,12 @@
-
+
-
+
Anexar Fotografia
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index e75e9c30b..282f5cd02 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -113,7 +113,7 @@ font-size: 25px;
.attach-document{
font-size: 15px;
- color: #0d89d1;
+ color: var(--title-text-color);
margin: 5px 5px 20px 10px;
padding: 5px;
float: left;
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 94e4885e0..a314b4e99 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -17,6 +17,7 @@ import { ThemePalette } from '@angular/material/core';
import { formatDate } from 'src/plugin/momentG.js'
import { FileLoaderService } from 'src/app/services/file/file-loader.service';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-new-publication',
@@ -69,7 +70,8 @@ export class NewPublicationPage implements OnInit {
private camera: Camera,
private toastService: ToastService,
private fileLoaderService: FileLoaderService,
- private fileToBase64Service: FileToBase64Service
+ private fileToBase64Service: FileToBase64Service,
+ public ThemeService: ThemeService
) {
this.publicationType = this.navParams.get('publicationType');
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html
index f716a524b..ea16990a6 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.html
@@ -4,8 +4,9 @@
-
- {{publication.Title}}
@@ -31,8 +32,9 @@
@@ -79,7 +85,9 @@
[class.item-active]="evento.ProcessId == idSelected"
(click)="goToPublicationsList(evento.ProcessId)">
@@ -95,7 +103,9 @@
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index 9c7c8c04b..c98ad9b40 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -149,7 +149,7 @@ ion-toolbar{
padding: 0 !important;
}
.item-content-title{
- color: #0d89d1;
+ color: var(--title-text-color);
font-size: 15px;
margin: 0 !important;
padding: 0 !important;
@@ -161,7 +161,7 @@ ion-toolbar{
padding: 0 !important;
}
.item-options{
- color: #42b9fe;
+ color: var(--box-hover-background-color);
width: 25px;
font-size: 20px;
}
@@ -172,12 +172,13 @@ ion-toolbar{
}
.item-active{
- background-color: #42b9fe !important;
+ background-color: var(--gabinete-active-hove-background) !important;
color: #fff !important;
+ pointer-events: none;
}
.item:hover{
- background-color: #e6f6ff75;
+ background-color: var(--box-hover-background-color) !important;
}
ion-item-options{
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 81a1d09b0..b96eb8e80 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -15,6 +15,7 @@ import { PublicationEventFolderStorage } from 'src/app/store/publication-event-f
import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-publications',
@@ -66,7 +67,8 @@ export class PublicationsPage implements OnInit {
private toastService: ToastService,
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
- private platform: Platform
+ private platform: Platform,
+ public ThemeService: ThemeService
) {
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
index 6b3c0436e..70c3a110a 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
@@ -13,7 +13,8 @@
{{publication.Title}}
@@ -37,7 +38,8 @@
{{ task.Folio }} {{ task.Status }}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index a8b52045f..a615fe98b 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -118,7 +118,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
- color: #0d89d1;
+ color: var(--title-text-color);
padding-left: 3px;
.subject{
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 7babda08a..785392167 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -9,6 +9,9 @@ import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido
import { PedidosStore } from 'src/app/store/pedidos-store.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
+import { ThemeService } from 'src/app/services/theme.service'
+
+
@Component({
selector: 'app-pedidos',
templateUrl: './pedidos.page.html',
@@ -44,6 +47,7 @@ export class PedidosPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private sortService: SortService,
+ public ThemeService: ThemeService
) {
this.profile = 'mdgpr';
}
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index 88b43af3c..fd63e6214 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -3,7 +3,7 @@
Pendentes
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
index f3ab83322..f58af1fdd 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
@@ -119,7 +119,7 @@ ion-item{
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
- color: #0d89d1;
+ color: var(--title-text-color);
padding-left: 3px;
.subject{
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 6c0d2b66c..5f12d2d70 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -1,94 +1,136 @@
-
-
@@ -46,22 +47,27 @@
[class.item-active]="viagem.ProcessId == idSelected"
>
-
+
-
-
+ De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}
-{{viagem.Description}}
-{{viagem.Detail}}
-
+
+
De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}
+{{viagem.Description}}
+{{viagem.Detail}}
+
-
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index a41378420..9b53a6c34 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -12,6 +12,7 @@ import { NewPublicationPage } from '../new-publication/new-publication.page';
import { PublicationDetailPage } from './publication-detail/publication-detail.page';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
+import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-view-publications',
@@ -43,7 +44,8 @@ export class ViewPublicationsPage implements OnInit {
private activatedRoute: ActivatedRoute,
private router: Router,
private sqliteservice: SqliteService,
- private backgroundservice: BackgroundService) {
+ private backgroundservice: BackgroundService,
+ public ThemeService: ThemeService) {
this.item = new PublicationFolder();
this.activatedRoute.paramMap.subscribe(params => {
diff --git a/src/app/pages/search/organic-entity/organic-entity.page.html b/src/app/pages/search/organic-entity/organic-entity.page.html
index efde8e18c..370fe9c6a 100644
--- a/src/app/pages/search/organic-entity/organic-entity.page.html
+++ b/src/app/pages/search/organic-entity/organic-entity.page.html
@@ -7,7 +7,8 @@
-
{{ task.Folio }}
-
diff --git a/src/app/pages/search/organic-entity/organic-entity.page.ts b/src/app/pages/search/organic-entity/organic-entity.page.ts
index a5e429bbe..f326df95d 100644
--- a/src/app/pages/search/organic-entity/organic-entity.page.ts
+++ b/src/app/pages/search/organic-entity/organic-entity.page.ts
@@ -3,6 +3,8 @@ import { ModalController } from '@ionic/angular';
import { from } from 'rxjs';
import { OrganicEntityService } from 'src/app/services/organic-entity.service';
import { OrganicEntity } from 'src/app/models/organic-entity.model';
+import { ThemeService } from 'src/app/services/theme.service'
+
@Component({
selector: 'app-organic-entity',
@@ -16,8 +18,11 @@ export class OrganicEntityPage implements OnInit {
findEntity: string;
- constructor(private modalController:ModalController,
- private OrganicEntityService: OrganicEntityService) {
+ constructor(
+ private modalController:ModalController,
+ private OrganicEntityService: OrganicEntityService,
+ public ThemeService: ThemeService
+ ) {
}
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 1d92a8d98..1e6c1766f 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -15,17 +15,18 @@
-
+
+
@@ -49,8 +50,9 @@
-
@@ -61,8 +63,9 @@
+
-
@@ -73,8 +76,9 @@
+
-
@@ -87,7 +91,7 @@
+
-
+
@@ -136,11 +140,13 @@
{{ category.Name }}
{{ category.Qtd }}
@@ -96,7 +100,7 @@
-
-
-
-
-diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss index 7957606f3..0fcd7aa44 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss @@ -21,7 +21,7 @@ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts index 8395a7ff8..32d53b3c0 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { customTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-task-list', @@ -12,7 +14,9 @@ export class TaskListPage implements OnInit { @Input() skeletonLoader: boolean = false @Output() viewTaskDetail = new EventEmitter
+ + + -+ + diff --git a/src/app/pages/search/sender/sender.page.ts b/src/app/pages/search/sender/sender.page.ts index 3a316bdc3..5052a3b70 100644 --- a/src/app/pages/search/sender/sender.page.ts +++ b/src/app/pages/search/sender/sender.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-sender', @@ -17,7 +18,8 @@ export class SenderPage implements OnInit { selectedUser: string; constructor(private modalController:ModalController, - private ContactsService: ContactsService) { + private ContactsService: ContactsService, + public ThemeService: ThemeService) { } diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index 84ed29d7c..e1670c200 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { ThemeService } from 'src/app/services/theme.service'; @Injectable({ providedIn: 'root' @@ -11,14 +12,27 @@ export class BackgroundService { funx: Function }[] = [] - constructor() { } + constructor( + private themeservice: ThemeService + ) { } online() { - document.body.style.setProperty(`--color`, "#0782C9"); - document.body.style.setProperty(`--color2`, "#45BAFF"); - document.body.style.setProperty(`--color3`, "#0782C9"); - document.body.style.setProperty(`--color4`, "#0782c9f0"); - document.body.style.setProperty(`--color5`, "#45BAFF"); + if (this.themeservice.currentTheme == 'gov') { + + document.body.style.setProperty(`--color`, "#d9d9d9"); + document.body.style.setProperty(`--color2`, "#f0f0f0"); + document.body.style.setProperty(`--color3`, "#d9d9d9"); + document.body.style.setProperty(`--color4`, "#d9d9d9ee"); + document.body.style.setProperty(`--color5`, "#ececec"); + + } else { + document.body.style.setProperty(`--color`, "#0782C9"); + document.body.style.setProperty(`--color2`, "#45BAFF"); + document.body.style.setProperty(`--color3`, "#0782C9"); + document.body.style.setProperty(`--color4`, "#0782c9f0"); + document.body.style.setProperty(`--color5`, "#45BAFF"); + } + this.callBacks.forEach((e) => { if (e.type == 'Online') { e.funx() @@ -46,4 +60,56 @@ export class BackgroundService { object }) } + + + greyTheme() { + document.body.style.setProperty(`--color`, "#D9D9D9"); + document.body.style.setProperty(`--color2`, "#f0f0f0"); + document.body.style.setProperty(`--color3`, "#D9D9D9"); + document.body.style.setProperty(`--color4`, "#d9d9d9ee"); + document.body.style.setProperty(`--color5`, "#ececec"); + + document.body.style.setProperty(`--header-container-background`, "#fff"); + document.body.style.setProperty(`--headercolor`, "#000"); + + document.body.style.setProperty(`--login-background`, "linear-gradient(180deg, #c63527 60%, #000 100%) !important"); + document.body.style.setProperty(`--button-hover`, "#ffb81c"); + document.body.style.setProperty(`--inicio-open-page-from-box`, "#c63527"); + document.body.style.setProperty(`--header-tab-top-border`, "#000"); + document.body.style.setProperty(`--header-tab-text-white`, "rgb(0, 0, 0)"); + document.body.style.setProperty(`--header-tab-text-white`, "rgb(0, 0, 0)"); + + document.body.style.setProperty(`--header-bottom-line-background`, "rgb(255, 0, 0)"); + document.body.style.setProperty(`--header-bottom-line-background-image`, "linear-gradient(to right, #C63527, #FFB81C, #FFC72C)"); + } + + blueTheme() { + + document.body.style.setProperty(`--color`, "#0782C9"); + document.body.style.setProperty(`--color2`, "#45BAFF"); + document.body.style.setProperty(`--color3`, "#0782C9"); + document.body.style.setProperty(`--color4`, "#0782c9f0"); + document.body.style.setProperty(`--color5`, "#f7f5f2"); + + document.body.style.setProperty(`--header-container-background`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + document.body.style.setProperty(`--headercolor`, "#000"); + + document.body.style.setProperty(`--header-bottom-line-background`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + document.body.style.setProperty(`--header-bottom-line-background-image`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + + document.body.style.setProperty(`--login-background`, "linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !importantt"); + document.body.style.setProperty(`--button-hover`, "#42b9fe"); + document.body.style.setProperty(`--inicio-open-page-from-box`, "#42b9fe"); + document.body.style.setProperty(`--header-tab-top-border`, "white"); + document.body.style.setProperty(`--header-tab-text-white`, "white"); + + } + + default() { + document.body.style.setProperty(`--color`, "#0782C9"); + document.body.style.setProperty(`--color2`, "#45BAFF"); + document.body.style.setProperty(`--color3`, "#0782C9"); + document.body.style.setProperty(`--color4`, "#0782c9f0"); + document.body.style.setProperty(`--color5`, "#45BAFF"); + } } diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index 9f63cff4d..dd839dd99 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -14,7 +14,8 @@diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss index 1a0dc6200..6f388901b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss @@ -58,7 +58,7 @@ ion-item{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 348545c09..5a45c172b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -4,6 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-expedients', @@ -26,6 +27,7 @@ export class ExpedientsPage implements OnInit { private processes:ProcessesService, private alertService: AlertService, private router: Router, + public ThemeService: ThemeService ) { this.profile = 'mdgpr'; diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html index 1211313ae..2d2699ca0 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html @@ -2,13 +2,15 @@-+ + {{ attendee.Name }}
@@ -35,7 +36,8 @@-+ + {{ attendee.Name }}
@@ -53,7 +55,8 @@-+ + {{ attendee.Name }}
diff --git a/src/app/services/events/attendees/attendees.page.ts b/src/app/services/events/attendees/attendees.page.ts index 5dfaeae0c..4936f9d95 100644 --- a/src/app/services/events/attendees/attendees.page.ts +++ b/src/app/services/events/attendees/attendees.page.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ModalController, NavParams } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendees', @@ -25,7 +26,8 @@ export class AttendeesPageModal implements OnInit { private modalCtrl: ModalController, private contactsService: ContactsService, private navParams: NavParams, - private modalController: ModalController) { + private modalController: ModalController, + public ThemeService: ThemeService) { this.adding = this.navParams.get('adding'); this.taskParticipants = this.navParams.get('taskParticipants'); diff --git a/src/app/services/events/edit-event/edit-event.page.scss b/src/app/services/events/edit-event/edit-event.page.scss index 0224ee793..69f54a2a0 100644 --- a/src/app/services/events/edit-event/edit-event.page.scss +++ b/src/app/services/events/edit-event/edit-event.page.scss @@ -91,7 +91,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/services/theme.service.spec.ts b/src/app/services/theme.service.spec.ts new file mode 100644 index 000000000..1c2957ba8 --- /dev/null +++ b/src/app/services/theme.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ThemeService } from './theme.service'; + +describe('ThemeService', () => { + let service: ThemeService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ThemeService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts new file mode 100644 index 000000000..5f41e5515 --- /dev/null +++ b/src/app/services/theme.service.ts @@ -0,0 +1,31 @@ +import { Injectable } from '@angular/core'; +import { StorageService } from 'src/app/services/storage.service'; + +@Injectable({ + providedIn: 'root' +}) +export class ThemeService { + + themes = [ + 'gov', + 'default', + 'tribunal' + ] + + currentTheme = 'gov' + + constructor(private storageservice: StorageService) { } + + setTheme(theme: 'gov' | 'default' | 'tribunal') { + + document.body.classList.remove("gov"); + document.body.classList.remove("default"); + document.body.classList.remove("tribunal"); + document.body.classList.add(theme); + this.currentTheme = theme + console.log('Current theme', theme); + this.storageservice.store('theme',theme); + + } + +} diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 8fccc23f2..671c6c56f 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -18,7 +18,8 @@@@ -33,7 +33,8 @@diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 53263290d..d03699f52 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -9,6 +9,8 @@ import { AuthService } from 'src/app/services/auth.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-expedientes-pr', @@ -33,6 +35,7 @@ export class ExpedientesPrPage implements OnInit { private alertService: AlertService, private authService: AuthService, private router: Router, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index cff3e4143..815e34d9d 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -3,7 +3,7 @@@@ -26,7 +27,9 @@ diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss index 16e0df76b..a3c0500fd 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -93,7 +93,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 473476872..c94d7daef 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -10,6 +10,7 @@ import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popo import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ToastService } from 'src/app/services/toast.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-approve-event', @@ -48,7 +49,8 @@ export class ApproveEventPage implements OnInit { private popoverController: PopoverController, private alertService: AlertService, private iab: InAppBrowser, - private toastService: ToastService + private toastService: ToastService, + public ThemeService: ThemeService ) { // Event to approve list diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 1c484cf20..7ccf43a4b 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -280,7 +280,7 @@ -@@ -274,7 +276,8 @@+@@ -301,7 +302,7 @@ -@@ -290,7 +290,8 @@ -+ + +@@ -331,7 +333,8 @@@@ -311,7 +312,8 @@ -+ + @@ -253,7 +254,8 @@Adicionar documentos @@ -352,7 +355,7 @@- {{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}
+{{document.Stakeholders}} {{document.CreateDate }}
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index 182551484..974b7236f 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -91,7 +91,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 347c6d60c..5570ca88b 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -125,6 +127,7 @@ export class EditEventToApprovePage implements OnInit { private attachmentsService: AttachmentsService, private processes:ProcessesService, private toastService: ToastService, + public ThemeService: ThemeService ) { this.isEventEdited = false; } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 7005206c6..488b36e05 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -3,7 +3,7 @@-Editar Evento aganda +Editar Evento @@ -230,7 +230,8 @@ @@ -325,7 +327,8 @@diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss index 0d1e3c664..effffe6ac 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -98,7 +98,7 @@ font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--title-text-color); margin: 0; padding: 0; } diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 0dce0afc6..9c068535c 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -236,7 +236,7 @@ -Adicionar documentos diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index e91c29131..e7613134d 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -103,7 +103,7 @@ ion-content{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index ef090f493..494b832fa 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -12,6 +12,8 @@ import { Attachment } from 'src/app/models/attachment.model'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ParticipantsPipe } from 'src/app/pipes/participants.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-edit-event', @@ -89,6 +91,7 @@ export class EditEventPage implements OnInit { public alertController: AlertController, private attachmentsService: AttachmentsService, private toastService: ToastService, + public ThemeService: ThemeService ) {} ngOnInit() { @@ -402,9 +405,9 @@ export class EditEventPage implements OnInit { SourceName: data.selected.Assunto, ParentId: this.postEvent.EventId, SourceId: data.selected.Id, - Stakeholders: false, + Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome, ApplicationId: data.selected.ApplicationType.toString(), - CreateDate: false, + CreateDate: data.selected.Data, // needed to attach this document Id: 'add', SourceTitle: data.selected.Assunto, diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index d62e48cca..62932ed7d 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -4,7 +4,7 @@Eventos para Aprovação+@@ -259,7 +260,7 @@ --@@ -247,8 +247,9 @@ -+ ++ +@@ -293,7 +295,8 @@-@@ -270,8 +271,9 @@ -+ ++ @@ -305,7 +306,8 @@Adicionar documentos diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index 0e05a84b1..8eeb1f499 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -106,7 +106,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index c3976d055..bcf7d5dc4 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -24,6 +24,8 @@ import { ThemePalette } from '@angular/material/core'; import { ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ThemeService } from 'src/app/services/theme.service' + const moment = _rollupMoment || _moment; @@ -118,6 +120,7 @@ export class NewEventPage implements OnInit { private toastService: ToastService, private userService: AuthService, private dateAdapter: DateAdapter, + public ThemeService: ThemeService // private translate: TranslateService ) { this.dateAdapter.setLocale('pt'); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index a99458714..2a6e6eb74 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -4,7 +4,8 @@ @@ -13,7 +14,8 @@ diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index 81059a609..4f044aa5f 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -163,7 +163,7 @@ ion-content{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 8277b7ecf..cff1408fe 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -12,6 +12,8 @@ import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTas import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-view-event', @@ -51,7 +53,8 @@ export class ViewEventPage implements OnInit { private processes: ProcessesService, private modalController: ModalController, public popoverController: PopoverController, - private toastService: ToastService + private toastService: ToastService, + public ThemeService: ThemeService ) { this.isEventEdited = false; this.loadedEvent = new Event(); diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html index 9b8db00e1..c984dc2d8 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html @@ -1,5 +1,6 @@diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss index 6a305a0f1..e27734267 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss @@ -120,7 +120,7 @@ ion-item{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 0f7cfaf72..53a5fdeb1 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -7,6 +7,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DeplomasStore } from 'src/app/store/deplomas.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-diplomas', @@ -33,6 +34,7 @@ constructor( private alertService: AlertService, private router: Router, private activatedRoute: ActivatedRoute, + public ThemeService: ThemeService ) { } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 22d37ee80..5e55f3555 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -284,7 +284,8 @@diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts index f8d5f8507..c51aed317 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-btn-modal-dismiss', @@ -10,6 +11,7 @@ export class BtnModalDismissPage implements OnInit { constructor( private modalController: ModalController, + public ThemeService: ThemeService ) { } diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/shared/chat/edit-group/edit-group.page.html index 9d046bfe9..5de4ba1db 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.html +++ b/src/app/shared/chat/edit-group/edit-group.page.html @@ -4,7 +4,8 @@diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts index 02ca60700..0ee77552b 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.ts +++ b/src/app/shared/chat/edit-group/edit-group.page.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ModalController, PickerController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-edit-group', @@ -26,6 +27,7 @@ export class EditGroupPage implements OnInit { private pickerController: PickerController, private chatService: ChatService, private authService: AuthService, + public ThemeService: ThemeService ) { this.loggedUser = authService.ValidatedUserChat['data']; } diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index 12efc9f18..e2ed656ff 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -2,9 +2,10 @@@@ -72,7 +73,8 @@-@@ -36,7 +36,8 @@diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 711f6b6d9..2292ba298 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -7,6 +7,8 @@ import { AlertService } from 'src/app/services/alert.service'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-diplomas-assinar', @@ -28,6 +30,7 @@ export class DiplomasAssinarPage implements OnInit { private alertService: AlertService, private router: Router, private sortService: SortService, + public ThemeService: ThemeService ) { } ngOnInit() { diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 056dec629..648755c77 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -3,7 +3,7 @@@@ -132,7 +134,7 @@ diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index c41b7e6b1..3a6238074 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -18,7 +18,7 @@ import { SearchList } from 'src/app/models/search-document'; import { ProcessesService } from 'src/app/services/processes.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; - +import { ThemeService } from 'src/app/services/theme.service' /* import * as pdfjsLib from 'pdfjs-dist'; @@ -84,6 +84,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private fileToBase64Service: FileToBase64Service, private processesService: ProcessesService, private fileService: FileService, + public ThemeService: ThemeService ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index e263f96f7..be0ccfea1 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -2,8 +2,9 @@@@ -167,10 +169,12 @@ diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 0bf21f51a..713fb7149 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -120,7 +120,7 @@ ion-item{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 36f91d6e7..f620b9cb4 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -3,7 +3,7 @@- -->-diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss index b33103830..d0b314011 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss @@ -51,7 +51,7 @@ ion-list{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .item-subject{ @@ -133,7 +133,7 @@ ion-list{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 8e5c542e4..5ccb1343c 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -7,6 +7,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'; import { SqliteService } from '../../../services/sqlite.service'; import { Platform } from '@ionic/angular'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-all-processes', @@ -26,6 +28,7 @@ export class AllProcessesPage implements OnInit { private sqliteservice: SqliteService, private platform: Platform, private sortService: SortService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; } diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 9d64f4db1..000a6c40e 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,13 +6,11 @@Adicionar contacto @@ -104,7 +106,7 @@diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 140abd646..8f11f9533 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -15,6 +15,7 @@ import { TimeService } from 'src/app/services/functions/time.service'; import { FileService } from 'src/app/services/functions/file.service'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-messages', @@ -70,6 +71,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private fileService: FileService, private gestureController: GestureController, private http:HttpClient, + public ThemeService: ThemeService ) { this.loggedUser = authService.ValidatedUserChat['data']; diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html index 291e6ef37..1a0b27564 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.html +++ b/src/app/shared/chat/new-group/contacts/contacts.page.html @@ -2,15 +2,16 @@@@ -141,10 +143,12 @@ -diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.ts b/src/app/shared/chat/new-group/contacts/contacts.page.ts index da4de0c8a..61a0cb101 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.ts +++ b/src/app/shared/chat/new-group/contacts/contacts.page.ts @@ -2,6 +2,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { GroupMessagesPage } from '../../group-messages/group-messages.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-contacts', @@ -53,6 +54,7 @@ export class ContactsPage implements OnInit { constructor( private modalController: ModalController, private http: HttpClient, + public ThemeService: ThemeService ) { this.headers = new HttpHeaders(); diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/shared/chat/new-group/new-group.page.scss index f7486d5fc..fa33e3e9f 100644 --- a/src/app/shared/chat/new-group/new-group.page.scss +++ b/src/app/shared/chat/new-group/new-group.page.scss @@ -69,7 +69,7 @@ ion-content{ padding: 0!important; float: right; font-size: 15px; - color: #0782c9; + color: var(--font-awesome); margin: 8px 5px 0 5px; } .right{ diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 1c3a0d70f..52fa56a75 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -14,14 +14,16 @@@@ -37,7 +37,8 @@-+ + {{ attendee.Name }}
{{ attendee.EmailAddress }}
-@@ -35,7 +37,8 @@+ ++ -+ + {{ attendee.Name }}
@@ -53,7 +56,8 @@-+ + {{ attendee.Name }}
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index d6beba13d..863095e9f 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -3,6 +3,7 @@ import { ModalController } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendee-modal', @@ -34,7 +35,8 @@ export class AttendeePage implements OnInit { constructor( private modalCtrl: ModalController, - private contactsService: ContactsService ) { + private contactsService: ContactsService, + public ThemeService: ThemeService ) { this.LtaskParticipants = removeDuplicate(this.taskParticipants); this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc); diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index c1c5b30a6..59b18648e 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -3,7 +3,7 @@Todas as tarefas {{ task.Folio }} -+Presidente da República
-diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss index d5c9b1208..0d4380ab9 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -33,7 +33,7 @@ .bottom-text{ font-size: 15px !important; font-family: Roboto !important; - color: #0d89d1 !important; + color: var(--title-text-color) !important; } } .item-list-small{ diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index c161a0c78..a0ea8b3b6 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -3,7 +3,7 @@ Despachos Diplomas @@ -41,7 +41,8 @@Diplomas para Assinar
{{ task.Folio }} Diplomas {{ task.Folio }} 1123{{ task.Folio }} -+ + -+ + @@ -25,7 +25,8 @@Adicionar documentos @@ -346,7 +349,7 @@- {{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}
+{{document.Stakeholders}} {{document.CreateDate }}
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index f52dd4e07..756e96fd5 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -91,7 +91,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 78837cf93..2c00a6a17 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -12,7 +12,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event, EventToApproveEdit } from '../../../models/event.model'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { NavigationExtras, Router } from '@angular/router'; - +import { ThemeService } from 'src/app/services/theme.service' const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -117,6 +117,7 @@ export class EditEventToApproveComponent implements OnInit { private animationController: AnimationController, private toastService: ToastService, private router:Router, + public ThemeService: ThemeService ) { // Edit event to approve this.serialNumber = this.navParams.get('serialNumber'); diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index c3d4f6f0c..5d96dfe12 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -3,7 +3,7 @@diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index d0a8dbd65..89ccd421b 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -92,7 +92,7 @@ font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--title-text-color);; margin: 0; padding: 0; } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 164aec4fb..3abb6d9de 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -3,7 +3,7 @@ Expediente {{ task.Subject }} Expediente {{ task.Subject }} diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss index 592d2c19e..818bde4da 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss @@ -91,7 +91,7 @@ ion-button{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts index c959779e3..594f57c78 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts @@ -1,5 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-task-details', @@ -18,7 +19,9 @@ export class TaskDetailsPage implements OnInit { @Output() goBack = new EventEmitter-+ + {{ task.Folio}} (); @Output() viewDocument = new EventEmitter (); - constructor() { } + constructor( + public ThemeService: ThemeService + ) { } ngOnInit() { } diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html index 1358175c1..bbce2a065 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html @@ -17,7 +17,8 @@ {{ task.Folio }} (); - constructor() { + constructor( + public ThemeService: ThemeService + ) { console.log('taskList', this.taskList) } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 97a5a57bb..898c7c71c 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -3,7 +3,7 @@ Pedidos
+
+
-
-
-
-
-
+
-
+
+
+
+
+ 
+ 
+ 
+
+
+
+
+
+ {{loggeduser.Profile}}
{{this.notificationLength}}
+
-
-
-
-
- {{loggeduser.Profile}}
-
- {{this.notificationLength}}
-
-
-
-
-
+
-
+
+
-
+
+
+
-
+
+
-
-
-
-
+
-
-
+
-
-
-
-
+
-
-
-
-
diff --git a/src/app/shared/popover/actions-options/actions-options.page.scss b/src/app/shared/popover/actions-options/actions-options.page.scss
index 37e90de2f..d03fc9ca3 100644
--- a/src/app/shared/popover/actions-options/actions-options.page.scss
+++ b/src/app/shared/popover/actions-options/actions-options.page.scss
@@ -32,7 +32,7 @@
}
.btn-cancel:hover, .btn-delete:hover{
color: #ffffff !important;
- background-color: #42b9fe;
+ background-color: var(--button-hover);
}
@media only screen and (max-width: 800px) {
.btn-ok, .btn-cancel, .btn-delete{
diff --git a/src/app/shared/popover/actions-options/actions-options.page.ts b/src/app/shared/popover/actions-options/actions-options.page.ts
index a6d49096d..eaec50b46 100644
--- a/src/app/shared/popover/actions-options/actions-options.page.ts
+++ b/src/app/shared/popover/actions-options/actions-options.page.ts
@@ -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');
}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 924b96c3a..a0042f5a1 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -1,7 +1,8 @@
-
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index 764111ce2..24def0c06 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -57,6 +57,7 @@
font-weight: 300;
width: fit-content;
position: absolute;
+ color: var(--profile-text-color);
}
}
.main-tab{
@@ -86,10 +87,10 @@
}
.tab:hover{
- border-top: 7px solid white;
+ border-top: 7px solid var(--header-tab-text-white);
}
.active{
- border-top: 7px solid white;
+ border-top: 7px solid var(--header-tab-text-white);
}
@@ -113,3 +114,8 @@
width: 20px;
}
}
+
+
+.tab {
+ color: var(--header-tab-text-white);
+}
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 31ccac939..de913d563 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -9,6 +9,7 @@ import { SessionStore } from 'src/app/store/session.service';
import { NotificationsService } from '../../services/notifications.service';
import { environment } from 'src/environments/environment';
import { EventTrigger } from '../../services/eventTrigger.service';
+import { ThemeService } from '../../services/theme.service';
@Component({
selector: 'app-header',
@@ -35,7 +36,8 @@ export class HeaderPage implements OnInit {
private storageservice: StorageService,
private platform: Platform,
private notificationsService: NotificationsService,
- private eventrigger: EventTrigger
+ private eventrigger: EventTrigger,
+ public ThemeService: ThemeService
) {
this.loggeduser = SessionStore.user;
router.events.subscribe((val) => {
diff --git a/src/app/shared/popover/actions-options/actions-options.page.html b/src/app/shared/popover/actions-options/actions-options.page.html
index efc6d9a54..939b76589 100644
--- a/src/app/shared/popover/actions-options/actions-options.page.html
+++ b/src/app/shared/popover/actions-options/actions-options.page.html
@@ -1,7 +1,8 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+ {{notificationLength}}
+
- {{profileLabel(loggeduser.Profile)}}
-
-
{{notificationLength}}