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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-10-27 18:16:21 +01:00
parent ae9bc339c9 5708fa69d8
commit 79b4177b9c
357 changed files with 3747 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+5 -2
View File
@@ -18,7 +18,8 @@
<div class="content d-flex flex-column">
<div class="header-content width-100 d-flex justify-space-between">
<div (click)="close()" class="header-icon-left cursor-pointer">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1 cursor-pointer">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11</label>
@@ -26,7 +27,9 @@
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
<button class="btn-no-color">
<ion-icon src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
</button>
</div>
src/app/shared/agenda/approve-event/approve-event.page.scss
+1 -1
View File
@@ -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;
src/app/shared/agenda/approve-event/approve-event.page.ts
+3 -1
View File
@@ -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
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+9 -6
View File
@@ -280,7 +280,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height d-flex" (click)="addParticipants()">
<div class="ion-input-class-no-height d-flex cursor-pointer" (click)="addParticipants()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
@@ -290,7 +290,8 @@
</ion-item>
</div>
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -301,7 +302,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
<div class="ion-input-class-no-height d-flex cursor-pointer" (click)="addParticipantsCC()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
@@ -311,7 +312,8 @@
</ion-item>
</div>
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -331,7 +333,8 @@
<div (click)="getDoc()" class="cursor-pointer d-flex container-div width-100 ion-item-container-no-border" >
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Adicionar documentos</ion-label>
@@ -352,7 +355,7 @@
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
<p><span class="span-left" *ngIf="document.Stakeholders != false">{{document.Stakeholders}}</span><span class="span-right" *ngIf="document.CreateDate != false"> {{document.CreateDate }} </span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss
+1 -1
View File
@@ -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;
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+3
View File
@@ -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;
}
src/app/shared/agenda/edit-event/edit-event.page.html
+7 -4
View File
@@ -3,7 +3,7 @@
<div class="main-header">
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar Evento aganda</ion-label>
<ion-label class="title">Editar Evento</ion-label>
</div>
</div>
<ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -230,7 +230,8 @@
</div>
<div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipants()">
<ion-icon class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button>
</div>
</div>
@@ -253,7 +254,8 @@
</div>
<div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()">
<ion-icon class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button>
</div>
</div>
@@ -274,7 +276,8 @@
<div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border cursor-pointer" >
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Adicionar documentos</ion-label>
src/app/shared/agenda/edit-event/edit-event.page.scss
+1 -1
View File
@@ -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;
src/app/shared/agenda/edit-event/edit-event.page.ts
+5 -2
View File
@@ -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,
src/app/shared/agenda/event-list/event-list.page.html
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="flex-grow-1">Eventos para Aprovação</div>
<div (click)="refreshing()">
<button class="btn-no-color" >
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
src/app/shared/agenda/event-list/event-list.page.scss
+1 -1
View File
@@ -98,7 +98,7 @@
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #0d89d1;
color: var(--title-text-color);
margin: 0;
padding: 0;
}
src/app/shared/agenda/new-event/new-event.page.html
+10 -7
View File
@@ -236,7 +236,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height flex-grow-1" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom">
<div class="ion-input-class-no-height flex-grow-1 cursor-pointer" (click)="addParticipants()" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom">
<div class="list-people">
<ion-item lines="none">
@@ -247,8 +247,9 @@
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipants()">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<div class="add-people cursor-pointer" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -259,7 +260,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height flex-grow-1" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom">
<div class="ion-input-class-no-height flex-grow-1 cursor-pointer" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom" (click)="addParticipantsCc()">
<div class="list-people">
<ion-item lines="none">
@@ -270,8 +271,9 @@
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipantsCc()">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<div class="add-people cursor-pointer" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -293,7 +295,8 @@
<div class="ion-item-container-no-border cursor-pointer" (click)="getDoc()">
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Adicionar documentos</ion-label>
src/app/shared/agenda/new-event/new-event.page.scss
+1 -1
View File
@@ -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;
src/app/shared/agenda/new-event/new-event.page.ts
+3
View File
@@ -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<any>,
public ThemeService: ThemeService
// private translate: TranslateService
) {
this.dateAdapter.setLocale('pt');
src/app/shared/agenda/view-event/view-event.page.html
+6 -3
View File
@@ -4,7 +4,8 @@
<div class="title-content d-flex" >
<div class="left">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle" (click)="openOptions()">
@@ -13,7 +14,8 @@
<div class="div-icon d-flex align-base">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
</button>
<button class="btn-no-color" (click)="deleteEvent()">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
@@ -92,7 +94,8 @@
</div>
<div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
<ion-icon src="assets/images/icons-menu.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg" ></ion-icon>
</div>
</ion-label>
src/app/shared/agenda/view-event/view-event.page.scss
+1 -1
View File
@@ -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;
src/app/shared/agenda/view-event/view-event.page.ts
+4 -1
View File
@@ -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();
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+2 -1
View File
@@ -1,5 +1,6 @@
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts
+2
View File
@@ -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
) {
}
src/app/shared/chat/edit-group/edit-group.page.html
+2 -1
View File
@@ -4,7 +4,8 @@
<div class="title-content">
<div class="left">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/iassets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle">
src/app/shared/chat/edit-group/edit-group.page.ts
+2
View File
@@ -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'];
}
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+3 -2
View File
@@ -2,9 +2,10 @@
<ion-toolbar class="header-toolbar">
<div class="main-header width-100">
<div class="title-content width-100">
<div class="back-icon">
<div class="back-icon cursor-pointer">
<button class="btn-no-color" (click)="openGroupMessagesPage()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="div-title">
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
+5 -5
View File
@@ -45,7 +45,7 @@
padding: 0!important;
float: right;
font-size: 15px;
color: #0782c9;
color: var(--font-awesome);
margin: 8px 5px 0 5px;
}
.title{
@@ -71,7 +71,7 @@
--border-radius: 5px;
--box-shadow: none;
overflow: hidden;
--icon-color:#0d89d1;
--icon-color:var(--font-awesome);
}
}
@@ -142,15 +142,15 @@
}
.item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
--border-color: #0d89d1;
--background-checked:#0d89d1;
--border-color: var(--title-text-color);
--background-checked:var(--title-text-color);
float: left;
}
.item-checkbox ion-label, .members-checkbox p{
padding-left: 10px;
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
float: left;
flex-grow: 1;
}
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+2
View File
@@ -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',
@@ -39,6 +40,7 @@ export class GroupContactsPage implements OnInit {
private http: HttpClient,
private chatService: ChatService,
private authService: AuthService,
public ThemeService: ThemeService
//private navParams: NavParams,
)
{
src/app/shared/chat/group-messages/group-messages.page.html
+9 -5
View File
@@ -7,13 +7,15 @@
</div>
<div class="right">
<button class="btn-no-color" (click)="openGroupMessagesOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
<div (click)="openGroupContactsPage()" class="header-bottom">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
</div>
<div class="header-bottom-contacts">
<ion-label class="contacts-list" *ngFor="let member of members" >
@@ -132,7 +134,7 @@
<div class="container width-100 d-flex">
<div>
<!-- <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
<ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
<ion-icon class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
</button> -->
<ion-fab horizontal="start" vertical="bottom" slot="fixed">
<ion-fab-button color="light" size="small">
@@ -167,10 +169,12 @@
</div>
<div>
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
src/app/shared/chat/group-messages/group-messages.page.ts
+2 -1
View File
@@ -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;
src/app/shared/chat/messages/contacts/contacts.page.html
+4 -3
View File
@@ -2,8 +2,9 @@
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="back-icon">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title">Nova Conversa</ion-label>
@@ -34,7 +35,7 @@
<ion-label>{{header}}</ion-label>
</div>
<div (click)="openMessagesPage(user.username)" *virtualItem="let user" class="item-user">
<div (click)="openMessagesPage(user.username)" *virtualItem="let user" class="item-user cursor-pointer">
<p>{{user.name}}</p>
<span class="icon">
<ion-icon class="{{user.status}}" slot="end" name="ellipse"></ion-icon>
src/app/shared/chat/messages/contacts/contacts.page.scss
+2 -2
View File
@@ -71,7 +71,7 @@
--border-radius: 5px;
--box-shadow: none;
overflow: hidden;
--icon-color:#0d89d1;
--icon-color:var( --font-awesome);
}
}
@@ -107,7 +107,7 @@
margin: 0 !important;
width: 90%;
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
float: left;
}
.item-user .icon{
src/app/shared/chat/messages/contacts/contacts.page.ts
+2
View File
@@ -5,6 +5,7 @@ import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { GroupMessagesPage } from '../../group-messages/group-messages.page';
import { MessagesPage } from '../messages.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-contacts',
@@ -30,6 +31,7 @@ export class ContactsPage implements OnInit {
private http: HttpClient,
private chatService: ChatService,
private authService: AuthService,
public ThemeService: ThemeService
)
{
this.loggedUser = authService.ValidatedUserChat['data'];
src/app/shared/chat/messages/messages.page.html
+9 -5
View File
@@ -8,7 +8,8 @@
</div>
<div hidden class="right">
<button class="btn-no-color" (click)="_openMessagesOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
@@ -18,7 +19,8 @@
</div> -->
<div hidden class="header-bottom" (click)="addContacts()">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
</div>
<div class="header-bottom-contacts">
<ion-label class="text-color-blue">Adicionar contacto</ion-label>
@@ -104,7 +106,7 @@
<div class="container width-100 d-flex">
<div>
<!-- <button class="btn-no-color" (click)="openSendMessageOptions()">
<ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
<ion-icon class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
</button> -->
<ion-fab horizontal="start" vertical="bottom" slot="fixed">
@@ -141,10 +143,12 @@
</div>
<div>
<button *ngIf="message" class="btn-no-color" (click)="sendMessage()">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
</button>
<button *ngIf="!message" class="btn-no-color">
<ion-icon class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
</button>
</div>
</div>
src/app/shared/chat/messages/messages.page.ts
+2
View File
@@ -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'];
src/app/shared/chat/new-group/contacts/contacts.page.html
+4 -3
View File
@@ -2,15 +2,16 @@
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="back-icon">
<div class="back-icon cursor-pointer">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="div-title">
<ion-label class="title">Contactos</ion-label>
</div>
<app-btn-seguinte (click)="groupMessages()"></app-btn-seguinte>
<app-btn-seguinte (click)="groupMessages()" class="cursor-pointer"></app-btn-seguinte>
</div>
</div>
</ion-toolbar>
src/app/shared/chat/new-group/contacts/contacts.page.ts
+2
View File
@@ -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();
src/app/shared/chat/new-group/new-group.page.scss
+1 -1
View File
@@ -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{
src/app/shared/event/attendee-modal/attendee-modal.page.html
+9 -5
View File
@@ -14,14 +14,16 @@
<div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" *ngIf="filterSearchList(attendee)" >
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
<div >
<ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon>
<div>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-add-25.svg" ></ion-icon>
</div>
</ion-item>
</div>
@@ -35,7 +37,8 @@
<ion-item-sliding class="px-20">
<ion-item *ngFor="let attendee of LtaskParticipants;" class="d-flex">
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
@@ -53,7 +56,8 @@
<ion-item-sliding class="px-20">
<ion-item *ngFor="let attendee of LtaskParticipantsCc;" class="d-flex">
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
src/app/shared/event/attendee-modal/attendee-modal.page.ts
+3 -1
View File
@@ -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);
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+3 -2
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -37,7 +37,8 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+2 -2
View File
@@ -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;
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+3
View File
@@ -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;
}
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -4
View File
@@ -6,13 +6,11 @@
</div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex">
<h3 class="bottom-text">Presidente da República</h3>
</div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -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{
src/app/shared/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Despachos</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
src/app/shared/gabinete-digital/despachos/despachos.page.scss
+1 -1
View File
@@ -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{
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+3 -2
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
<div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas para Assinar</h3></div>
@@ -41,7 +41,8 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+3
View File
@@ -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() {
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+5 -3
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -36,7 +36,8 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
@@ -72,7 +73,8 @@
<ion-label>1123{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
+1 -1
View File
@@ -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{
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+2
View File
@@ -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
) {
}
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+7 -4
View File
@@ -284,7 +284,8 @@
</ion-item>
</div>
<div class="add-people cursor-pointer">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -305,7 +306,8 @@
</ion-item>
</div>
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -325,7 +327,8 @@
<div (click)="getDoc()" class="cursor-pointer d-flex container-div width-100 ion-item-container-no-border" >
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Adicionar documentos</ion-label>
@@ -346,7 +349,7 @@
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
<p><span class="span-left" *ngIf="document.Stakeholders != false">{{document.Stakeholders}}</span><span class="span-right" *ngIf="document.CreateDate != false"> {{document.CreateDate }} </span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss
+1 -1
View File
@@ -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;
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+2 -1
View File
@@ -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');
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="title-container d-flex justify-space-between">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
<ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
<ion-toolbar>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+1 -1
View File
@@ -92,7 +92,7 @@
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #0d89d1;
color: var(--title-text-color);;
margin: 0;
padding: 0;
}
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+3 -2
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Expediente</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="refreshing()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -25,7 +25,8 @@
<ion-label>{{ task.Subject }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default'" src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov'" src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+3
View File
@@ -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;
}
src/app/shared/gabinete-digital/expedients/expedients.page.html
+3 -2
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Expediente</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -33,7 +33,8 @@
<ion-label>{{ task.Subject }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/expedients/expedients.page.scss
+1 -1
View File
@@ -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{
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+2
View File
@@ -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';
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+4 -2
View File
@@ -2,13 +2,15 @@
<div class="main-header">
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack.emit()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions.emit()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</div>
</div>
</div>
src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+1 -1
View File
@@ -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;
src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts
+4 -1
View File
@@ -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<any>();
@Output() viewDocument = new EventEmitter<any>();
constructor() { }
constructor(
public ThemeService: ThemeService
) { }
ngOnInit() {
}
src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+2 -1
View File
@@ -17,7 +17,8 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss
+1 -1
View File
@@ -21,7 +21,7 @@
font-family: Roboto;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
color: var(--title-text-color);
padding-left: 3px;
.subject{
src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts
+5 -1
View File
@@ -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<customTask>();
constructor() {
constructor(
public ThemeService: ThemeService
) {
console.log('taskList', this.taskList)
}
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+5 -3
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Pedidos</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -47,7 +47,8 @@
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
@@ -84,7 +85,8 @@
<ion-label>{{ task.Folio }} {{ task.Status }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+1 -1
View File
@@ -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{
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+4
View File
@@ -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';
}
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="thetitle"><ion-label >Pendentes</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+1 -1
View File
@@ -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{
src/app/shared/header/header.page.html
+111 -69
View File
@@ -1,94 +1,136 @@
<div class="main-tab pb-10 ion-toolbar text-white">
<div class="header-container">
<div class="main-tab pb-10 ion-toolbar text-white">
<div class="mobile d-flex div-top-header justify-space-between">
<div *ngIf="!hideSearchBtn" class="div-search">
<div (click)="openSearch()">
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
<div class="mobile d-flex div-top-header justify-space-between">
<div *ngIf="!hideSearchBtn" class="div-search">
<div (click)="openSearch()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-45" src='assets/images/icons-search.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-45" src='assets/images/theme/tribunal/icons-search.svg'></ion-icon>
</div>
</div>
<div class="div-logo height-fit-content">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/gabinetedigital_logo.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'tribunal' " src='assets/images/theme/tribunal/tribunal-constitucional.png' alt='logo'>
</div>
<div class="div-profile cursor-pointer" (click)="openProfile()">
<div *ngIf="this.notificationLength > 0" class="icon-badge">{{this.notificationLength}}</div>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="icon" src='assets/images/theme/tribunal/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile cursor-pointer" (click)="openProfile()">
<div *ngIf="this.notificationLength > 0" class="icon-badge" >{{this.notificationLength}}</div>
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
</div>
</div>
<div class="desktop mx-20">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="desktop mx-20">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<div class="d-flex flex-1 pr-20 pl-50">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/gabinetedigital_logo.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'tribunal' " src='assets/images/theme/tribunal/tribunal-constitucional.png' alt='logo'>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
<span>Início</span>
</div>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')" [class.active]="locationPathname() == '/home/agenda'">
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="d-flex flex-1 pr-20 pl-50">
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/events')"
[class.active]="locationPathname() == '/home/events'">
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')" [class.active]="locationPathname() == '/home/publications'">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Acções</span>
</div>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-active-black.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-active-black.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" src='assets/images/theme/gov/icons-nav-home-active-black.svg'></ion-icon>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
<ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<span>Chat</span>
</div>
</div>
<div class="header-btns d-flex">
<div *ngIf="!hideSearchBtn" class="mr-10 d-flex align-center cursor-pointer">
<div style="padding-top: 5px;" (click)="openSearch();showSearch=true" *ngIf="!showSearch" >
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
<span>Início</span>
</div>
<button class="btn-no-color" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch" >
<ion-icon class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
</button>
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch" >
<div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div>
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()" class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<div class="icon" (click)="clearSearchInput()">
<ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/agenda')"
[class.active]="locationPathname() == '/home/agenda'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-agenda-inactive.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" src='assets/images/theme/gov/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/gabinete-digital')"
[class.active]="locationPathname() == '/home/gabinete-digital'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-home-dk.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" src='assets/images/theme/gov/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/publications')"
[class.active]="locationPathname() == '/home/publications'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-a-es-inactive.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" src='assets/images/theme/gov/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Acções</span>
</div>
<div class="tab mr-20 d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')"
[class.active]="locationPathname() == '/home/chat'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" src='assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" src='assets/images/theme/gov/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<span>Chat</span>
</div>
</div>
<div class="header-btns d-flex">
<div *ngIf="!hideSearchBtn" class="mr-10 d-flex align-center cursor-pointer">
<div style="padding-top: 5px;" (click)="openSearch();showSearch=true" *ngIf="!showSearch">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-45" src='assets/images/icons-search.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-45" src='assets/images/theme/tribunal/icons-search.svg'></ion-icon>
</div>
<button class="btn-no-color" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-40" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="font-40" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</button>
<div *ngIf="showSearch">
<div class="d-flex search-input-container ml-10 justify-between" *ngIf="showSearch">
<div class="icon" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div>
<div class="input-text d-flex ion-align-items-center">
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<div class="icon" (click)="clearSearchInput()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
</div>
</div>
</div>
<div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="icon" src='assets/images/theme/tribunal/icons-profile.svg'></ion-icon>
<div class="profile-text">
<!-- <ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label> -->
<div *ngIf="this.notificationLength > 0 && !production" class="icon-badge"
style="right: -18px;top: -9px;">
{{notificationLength}}</div>
</div>
<div class="profile-text">
<ion-label>{{profileLabel(loggeduser.Profile)}}</ion-label>
<div *ngIf="this.notificationLength > 0 && !production" class="icon-badge" style="right: -18px;top: -9px;" >{{notificationLength}}</div>
</div>
</div>
</div>
</div>
</div>
<div class="header-bottom-line"></div>
</div>
src/app/shared/header/header.page.scss
+8 -2
View File
@@ -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);
}
src/app/shared/header/header.page.ts
+3 -1
View File
@@ -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) => {
src/app/shared/popover/actions-options/actions-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/actions-options/actions-options.page.scss
+1 -1
View File
@@ -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{
src/app/shared/popover/actions-options/actions-options.page.ts
+3 -1
View File
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-actions-options',
@@ -16,7 +17,8 @@ export class ActionsOptionsPage implements OnInit {
private modalController: ModalController,
private navParams: NavParams,
private publicationsService: PublicationsService,
private toastService: ToastService
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.id = this.navParams.get('id');
}
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+2
View File
@@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AlertService } from 'src/app/services/alert.service';
import { environment } from 'src/environments/environment';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-options-popover',
@@ -23,6 +24,7 @@ export class ChatOptionsPopoverPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private navParams: NavParams,
public ThemeService: ThemeService
) {
this.members = this.navParams.get('members');
src/app/shared/popover/chat-popover/chat-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close('cancel')">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/chat-popover/chat-popover.page.scss
+1 -1
View File
@@ -37,7 +37,7 @@
margin-bottom: 10px !important;
}
.btn-cancel:hover, .btn-delete:hover{
background-color: #42b9fe;
background-color: var(--button-hover);
color: #fff !important;
}
.btn-ok{
src/app/shared/popover/chat-popover/chat-popover.page.ts
+3
View File
@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-popover',
@@ -18,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
private navParams: NavParams,
private chatService: ChatService,
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.roomId = this.navParams.get('roomId');
}
src/app/shared/popover/despachos-options/despachos-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/despachos-options/despachos-options.page.ts
+2
View File
@@ -10,6 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { ToastService } from 'src/app/services/toast.service';
import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
@@ -31,6 +32,7 @@ export class DespachosOptionsPage implements OnInit {
private navParams: NavParams,
private toastService: ToastService,
public p: PermissionService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+3
View File
@@ -10,6 +10,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-despachos-pr-options',
@@ -33,6 +35,7 @@ export class DespachosPrOptionsPage implements OnInit {
private toastService: ToastService,
private location: Location,
public p: PermissionService,
public ThemeService: ThemeService
) { }
ngOnInit() {
src/app/shared/popover/messages-options/messages-options.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/shared/popover/messages-options/messages-options.page.ts
+3
View File
@@ -1,6 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-messages-options',
@@ -16,6 +18,7 @@ export class MessagesOptionsPage implements OnInit {
private modalController: ModalController,
private chatService: ChatService,
private navParams: NavParams,
public ThemeService: ThemeService
)
{
this.roomId = this.navParams.get('roomId');
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html
+2 -1
View File
@@ -2,7 +2,8 @@
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</button>
</div>
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+3
View File
@@ -13,6 +13,8 @@ import { AuthService } from 'src/app/services/auth.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-opts-expediente-pr',
@@ -49,6 +51,7 @@ export class OptsExpedientePrPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
private location: Location,
public ThemeService: ThemeService
) {
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="options-container width-100 ">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="width-100">
src/app/shared/popover/opts-expediente/opts-expediente.page.scss
+2 -1
View File
@@ -60,4 +60,5 @@
.desk{
text-align: left;
background-color: white;
}
color: var(--profile-text-color);
}
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+4 -1
View File
@@ -16,6 +16,8 @@ import { Location } from '@angular/common';
import { TaskService } from 'src/app/Rules/task.service'
import { ExpedienteService } from 'src/app/Rules/expediente.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-opts-expediente',
@@ -45,7 +47,8 @@ export class OptsExpedientePage implements OnInit {
private attachmentsService: AttachmentsService,
private location: Location,
private TaskService: TaskService,
private expedienteService: ExpedienteService
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
src/app/shared/publication/new-publication/new-publication.page.html
+5 -5
View File
@@ -44,11 +44,11 @@
</div>
<div class="ion-item-container-no-border">
<ion-label (click)="laodPicture()">
<ion-label (click)="laodPicture()" class="cursor-pointer">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document">
<div class="attach-document cursor-pointer">
<ion-label>Anexar Fotografia</ion-label>
</div>
</ion-label>
@@ -75,18 +75,18 @@
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photo.svg"></ion-icon>
</div>
<div class="attach-document">
<div class="attach-document cursor-pointer">
<ion-label>Tirar Fotografia</ion-label>
</div>
</ion-label>
</div>
<div class="ion-item-container-no-border hide-desktop">
<ion-label (click)="getPicture()">
<ion-label (click)="getPicture()" class="cursor-pointer">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document">
<div class="attach-document cursor-pointer">
<ion-label>Anexar Fotografia</ion-label>
</div>
</ion-label>
src/app/shared/publication/new-publication/new-publication.page.scss
+1 -1
View File
@@ -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;
src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html
+6 -4
View File
@@ -8,9 +8,10 @@
<div class="content-container">
<div *ngIf="publication.Title != ''">
<div class="title-content d-flex pl-20">
<div class="back-icon " (click)="goBack()">
<div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon class="font-30" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
@@ -37,8 +38,9 @@
</div>
<div *ngIf="publication.Title == ''">
<div class="title-content">
<div class="back-icon">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+2
View File
@@ -7,6 +7,7 @@ import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
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 { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-publication-detail-shared',
@@ -29,6 +30,7 @@ export class PublicationDetailPage implements OnInit {
private publications:PublicationsService,
private animationController: AnimationController,
private toastService: ToastService,
public ThemeService: ThemeService
) {
/* this.folderId = this.navParams.get('folderIdId'); */
src/app/shared/publication/view-publications/view-publications.page.html
+6 -5
View File
@@ -11,13 +11,14 @@
<p class="item-content-detail">{{item.Detail}}</p>
<p class="item-content-date">{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}</p>
</div>
<div class="actions-icon">
<div class="actions-icon ">
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
<button class="btn-no-color" (click)="AddPublication('2',item.ProcessId)">
<ion-icon src='assets/images/icons-add.svg'></ion-icon>
<button class="btn-no-color cursor-pointer" (click)="AddPublication('2',item.ProcessId)">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/icons-add.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/icons-add.svg'></ion-icon>
</button>
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
<button class="btn-no-color cursor-pointer" (click)="doRefresh($event)">
<ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button >
</div>
</div>
src/app/shared/publication/view-publications/view-publications.page.scss
+1 -1
View File
@@ -148,7 +148,7 @@
width: 60%;
float: left;
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
}
.post-data{
width: 40%;
src/app/shared/publication/view-publications/view-publications.page.ts
+4 -1
View File
@@ -10,6 +10,8 @@ import { PublicationListStorage } from 'src/app/store/publication-list.service'
import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
import { PublicationPipe } from 'src/app/pipes/publication.pipe';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-view-publications',
templateUrl: './view-publications.page.html',
@@ -42,7 +44,8 @@ export class ViewPublicationsPage implements OnInit {
constructor(
private loadingController: LoadingService,
private modalController: ModalController,
private publications: PublicationsService
private publications: PublicationsService,
public ThemeService: ThemeService
) {
this.item = new PublicationFolder();
}