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

Merge branch '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
config.xml
-6
View File
@@ -27,12 +27,6 @@
<resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
<resource-file src="google-services.json" target="google-services.json" />
<allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
package-lock.json
Generated
+8
View File
@@ -4491,6 +4491,14 @@
}
}
},
"angular-svg-icon": {
"version": "12.0.0",
"resolved": "https://registry.npmjs.org/angular-svg-icon/-/angular-svg-icon-12.0.0.tgz",
"integrity": "sha512-nPAbF/U6sHdY+Dt/J5TZuUNOGRZmxoqJioRfLGMeNt8ycbBbTwq1OmkZ7DLuF02+XGafGHwzmI5/2y9OWAl+TA==",
"requires": {
"tslib": "^2.2.0"
}
},
"angular-tag-cloud-module": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.3.0.tgz",
package.json
+2 -1
View File
@@ -6,7 +6,7 @@
"scripts": {
"ng": "ng",
"start": "ng serve --port 4200",
"build": "ng build",
"build": "node --max_old_space_size=999192 ./node_modules/@angular/cli/bin/ng build",
"lint": "ng lint",
"e2e": "ng e2e",
"test": "jest --detectOpenHandles --runInBand",
@@ -72,6 +72,7 @@
"@types/jest-environment-puppeteer": "^4.4.1",
"@types/puppeteer": "^5.4.4",
"angular-calendar": "^0.28.22",
"angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2",
"bootstrap": "^4.5.0",
"build": "0.1.4",
readme.md
+1 -1
View File
@@ -23,7 +23,7 @@ cordova plugin add cordova-plugin-mfp
ionic cordova plugin add cordova-plugin-network-information
## memory leak
set NODE_OPTIONS=--max_old_space_size=10096
set NODE_OPTIONS=--max_old_space_size=99996
```
## BUG
resources/android/icon/mipmap-hdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

resources/android/icon/mipmap-mdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

resources/android/icon/mipmap-xhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.0 KiB

resources/android/icon/mipmap-xxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

resources/android/icon/mipmap-xxxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

resources/android/splash/drawable-land-hdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

resources/android/splash/drawable-land-ldpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

resources/android/splash/drawable-land-mdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

resources/android/splash/drawable-land-xhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 12 KiB

resources/android/splash/drawable-land-xxhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 16 KiB

resources/android/splash/drawable-land-xxxhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 20 KiB

resources/android/splash/drawable-port-hdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

resources/android/splash/drawable-port-ldpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

resources/android/splash/drawable-port-mdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

resources/android/splash/drawable-port-xhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 15 KiB

resources/android/splash/drawable-port-xxhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 19 KiB

resources/android/splash/drawable-port-xxxhdpi-screen.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 24 KiB

resources/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 45 KiB

resources/splash.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 16 KiB

src/app/modals/add-note/add-note.page.html
+4 -3
View File
@@ -9,12 +9,13 @@
</div>
<div *ngIf="hideThisFeature" class="ion-item-container-no-border">
<ion-label class="attach-wrapper d-flex align-center" (click)="getDoc()">
<ion-label class="attach-wrapper d-flex align-center cursor-pointer" (click)="getDoc()">
<button class="btn-no-color">
<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 pl-10">
<div class="attach-document pl-10 ">
<ion-label>Anexar Documentos</ion-label>
</div>
</button>
src/app/modals/add-note/add-note.page.scss
+1 -1
View File
@@ -68,7 +68,7 @@ float: left;
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
src/app/modals/add-note/add-note.page.ts
+2
View File
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { SearchList } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-add-note',
@@ -18,6 +19,7 @@ export class AddNotePage implements OnInit {
private modalController: ModalController,
private animationController: AnimationController,
private navParams: NavParams,
public ThemeService: ThemeService
) {
this.note = '';
this.hideThisFeature = this.navParams.get('showAttachmentBtn');
src/app/modals/chat-options-features/chat-options-features.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="container">
<div class="arrow-right">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/modals/chat-options-features/chat-options-features.page.scss
+1 -1
View File
@@ -39,7 +39,7 @@
width: 100% !important;
}
.btn-cancel:hover{
background-color: #42b9fe;
background-color: var(--button-hover);
color: #fff !important;
}
.mobile-only{
src/app/modals/chat-options-features/chat-options-features.page.ts
+2
View File
@@ -9,6 +9,7 @@ import { ChatService } from 'src/app/services/chat.service';
import { FileLoaderService } from 'src/app/services/file/file-loader.service';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { environment } from 'src/environments/environment';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-chat-options-features',
@@ -32,6 +33,7 @@ export class ChatOptionsFeaturesPage implements OnInit {
private fileLoaderService: FileLoaderService,
private fileToBase64Service: FileToBase64Service,
private chatService: ChatService,
public ThemeService: ThemeService
) {
this.members = this.navParams.get('members');
src/app/modals/create-process/create-process.page.html
+11 -8
View File
@@ -91,7 +91,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipants();" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -100,8 +100,9 @@
</ion-list>
</ion-item>
</div>
<div class="add-people" (click)="addParticipants();">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<div class="add-people" >
<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>
@@ -112,7 +113,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipantsCc();">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -121,17 +122,19 @@
</ion-list>
</ion-item>
</div>
<div class="add-people" (click)="addParticipantsCc();">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<div class="add-people" >
<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>
</div>
<div class="ion-item-container-no-border" (click)="getDoc()">
<div class="ion-item-container-no-border cursor-pointer" (click)="getDoc()">
<ion-label class="d-flex align-center">
<div class="attach-icon d-flex align-center">
<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 pl-10">
<ion-label>Anexar Documentos</ion-label>
src/app/modals/create-process/create-process.page.scss
+1 -1
View File
@@ -76,7 +76,7 @@
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
}
.attach-title-item{
src/app/modals/create-process/create-process.page.ts
+4 -1
View File
@@ -20,6 +20,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service';
import { DespachoService } from 'src/app/Rules/despacho.service';
import { PedidoService } from 'src/app/Rules/pedido.service'
import { fullTask } from 'src/app/models/dailyworktask.model';
import { ThemeService } from 'src/app/services/theme.service'
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -97,7 +99,8 @@ export class CreateProcessPage implements OnInit {
private toastService: ToastService,
public p: PermissionService,
private despachoService: DespachoService,
private pedidoService: PedidoService
private pedidoService: PedidoService,
public ThemeService: ThemeService
) {
this.loggeduser = userAuth.ValidatedUser;
this.task = this.navParams.get('task');
src/app/modals/dar-parecer/dar-parecer.page.html
+3 -2
View File
@@ -15,9 +15,10 @@
</div>
</div>
<div class="ion-item-container-no-border" >
<ion-label (click)="getDoc()" class="d-flex align-center">
<ion-label (click)="getDoc()" class="d-flex align-center cursor-pointer">
<div class="attach-icon d-flex align-center">
<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 pl-10">
<ion-label>Anexar Documentos</ion-label>
src/app/modals/dar-parecer/dar-parecer.page.scss
+1 -1
View File
@@ -80,7 +80,7 @@
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
src/app/modals/dar-parecer/dar-parecer.page.ts
+2
View File
@@ -4,6 +4,7 @@ import { SearchList } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-dar-parecer',
@@ -22,6 +23,7 @@ export class DarParecerPage implements OnInit {
private navParams: NavParams,
private animationController: AnimationController,
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('ProcessInstanceID');
src/app/modals/delegar/delegar.page.html
+5 -3
View File
@@ -24,7 +24,8 @@
</ion-item>
</div>
<div class="add-people" (click)="addParticipants()">
<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 == 'default' " slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
@@ -42,9 +43,10 @@
</div>
<div *ngIf="hideThisFeature" class="ion-item-container-no-border">
<ion-label (click)="getDoc()">
<ion-label (click)="getDoc()" class="cursor-pointer">
<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>Anexar Documentos</ion-label>
src/app/modals/delegar/delegar.page.scss
+1 -1
View File
@@ -77,7 +77,7 @@
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
src/app/modals/delegar/delegar.page.ts
+3
View File
@@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service';
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
import { SearchList } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-delegar',
@@ -52,6 +54,7 @@ export class DelegarPage implements OnInit {
private alertService: AlertService,
private animationController: AnimationController,
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task');
this.postData = new Event();
src/app/modals/document-detail/document-detail.page.html
+3 -1
View File
@@ -9,7 +9,9 @@
<ion-label class="title">{{LoadedDocument.Assunto}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
<ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<!-- <ion-icon class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon> -->
</div>
</div>
</div>
src/app/modals/document-detail/document-detail.page.scss
+1 -1
View File
@@ -130,7 +130,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/modals/document-detail/document-detail.page.ts
+3
View File
@@ -11,6 +11,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service';
import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page';
import { Location } from '@angular/common';
import { ViewDocumentPage } from '../view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-document-detail',
@@ -45,6 +47,7 @@ export class DocumentDetailPage implements OnInit {
public p: PermissionService,
private popoverController: PopoverController,
private location: Location,
public ThemeService: ThemeService
) {
this.docId = this.navParams.get('docId');
this.applicationId = this.navParams.get('applicationId');
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+7 -4
View File
@@ -276,7 +276,8 @@
</ion-item>
</div>
<div class="add-people" >
<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>
@@ -297,7 +298,8 @@
</ion-item>
</div>
<div class="add-people" >
<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>
@@ -316,8 +318,9 @@
<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>
<div class="attach-icon cursor-pointer">
<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>Anexar Documentos</ion-label>
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss
+1 -1
View File
@@ -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;
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+4 -1
View File
@@ -17,6 +17,8 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
import { EventsService } from 'src/app/services/events.service';
import { EventService } from 'src/app/services/rules/event.service';
import { EventPipe } from 'src/app/pipes/event.pipe';
import { ThemeService } from 'src/app/services/theme.service'
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -96,7 +98,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
authService: AuthService,
private toastService: ToastService,
private calendarService: EventsService,
private eventService: EventService
private eventService: EventService,
public ThemeService: ThemeService
) {
this.loggeduser = authService.ValidatedUser;
this.document = this.navParams.get('document')
src/app/modals/document-viewer/document-viewer.page.html
+2 -1
View File
@@ -3,7 +3,8 @@
<div class="d-flex px-20 pt-20">
<div class="cursor-pointer" (click)="close()">
<ion-icon class="font-35" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
</div>
<div class="font-25">{{ fileName }}</div>
src/app/modals/document-viewer/document-viewer.page.ts
+3 -1
View File
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
import { ProcessesService } from 'src/app/services/processes.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
@@ -19,7 +20,8 @@ export class DocumentViewerPage implements OnInit {
constructor(
private modalController: ModalController,
private navParams: NavParams,
private processes: ProcessesService) {
public processes: ProcessesService,
public ThemeService: ThemeService) {
this.task = this.navParams.get('task') || null;
this.DocId = this.navParams.get('DocId');
src/app/modals/forward/forward.page.html
+5 -13
View File
@@ -14,7 +14,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">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipants()">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -23,8 +23,9 @@
</ion-list>
</ion-item>
</div>
<div class="add-people" (click)="addParticipants()">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<div class="add-people" >
<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>
@@ -41,16 +42,7 @@
</div>
</div>
<div hidden class="ion-item-container-no-border">
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Anexar Documentos</ion-label>
</div>
</ion-label>
</div>
<div *ngIf="loadedAttachments">
<ion-item>
src/app/modals/forward/forward.page.scss
+1 -1
View File
@@ -77,7 +77,7 @@
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
src/app/modals/forward/forward.page.ts
+3
View File
@@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service';
import { SearchList } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-forward',
@@ -53,6 +55,7 @@ export class ForwardPage implements OnInit {
private alertService: AlertService,
private animationController: AnimationController,
private toastService: ToastService,
public ThemeService: ThemeService
) {
this.task = this.navParams.get('task');
this.postData = new Event();
src/app/modals/profile/edit-profile/edit-profile.page.html
+37 -8
View File
@@ -7,7 +7,9 @@
</div>
</div>
<div class="btn-close d-flex cursor-pointer" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div>
</div>
<div class="profile-content overflow-y-auto width-100 height-100">
@@ -21,9 +23,11 @@
</div> -->
</div>
<div >
<div>
<div class="d-flex align-center">
<ion-icon class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="profile-pic" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="profile-pic" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div>
</div>
@@ -33,7 +37,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" name="person"></ion-icon>
<ion-icon slot="start" name="person" class="ion-icon-class-theme"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input disabled placeholder="Nome" [(ngModel)]="SessionStore.user.FullName"></ion-input>
@@ -44,14 +48,39 @@
<div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" name="mail"></ion-icon>
<ion-icon slot="start" name="mail" class="ion-icon-class-theme"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input disabled placeholder="Email" [(ngModel)]="SessionStore.user.Email"></ion-input>
</div>
</div>
</div>
<div class="profile-title d-flex justify-space-between align-center width-100">
<div class="d-flex align-center">
<div>Tema</div>
</div>
</div>
<div class="profile-title d-flex justify-space-between align-center width-100">
<div class="d-flex align-center">
<div class="btn-close d-flex cursor-pointer" (click)="changeTheme('gov')">
<img style="width: 40px;" src="assets/images/theme/gov/governoangola_A.png">
</div>
<div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('default')" >
<img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
</div>
<div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('tribunal')" >
<img style="width: 40px;" src="assets/images/theme/tribunal/tribunal-constitucional-logo.png"/>
</div>
</div>
</div>
</div>
<div class="login-preference width-100" *ngIf="!platform.is('desktop') && !platform.is('mobileweb')">
<div class="preference">Preferência Login</div>
@@ -59,7 +88,7 @@
<ion-row>
<ion-col class="align-center d-flex">
<div class="d-flex align-center" (click)="LoginPreferenceMethod('Pin')">
<ion-checkbox [checked]="SessionStore.user.LoginPreference=='Pin' " class="checkBox" ></ion-checkbox>
<ion-checkbox [checked]="SessionStore.user.LoginPreference=='Pin' " class="checkBox"></ion-checkbox>
PIN
</div>
</ion-col>
@@ -77,12 +106,12 @@
<div class="d-flex justify-space-between">
<ion-buttons slot="start" (click)="close()">
<button class="btn-cancel" fill="clear" color="#061b52" >
<button class="btn-cancel" fill="clear" color="#061b52">
<ion-label>Cancelar</ion-label>
</button>
</ion-buttons>
<ion-buttons slot="end" (click)="close()">
<button class="btn-ok" fill="clear" color="#fff" >
<button class="btn-ok" fill="clear" color="#fff">
<ion-label>Gravar</ion-label>
</button>
</ion-buttons>
src/app/modals/profile/edit-profile/edit-profile.page.scss
+6 -1
View File
@@ -40,7 +40,7 @@
}
.profile-info{
margin-top: 20px;
color: #fff;
color: black;
font-family: Roboto;
font-size: 13px;
@@ -78,6 +78,7 @@
padding-right: 10px;
float: left;
background-color: transparent;
color: var(--profile-text-color);
}
}
}
@@ -95,6 +96,10 @@
border-color: transparent !important;
}
.ion-icon-class-theme {
color: var(--profile-text-color) ;
}
.login-preference{
margin-top: 15px;
float: left;
src/app/modals/profile/edit-profile/edit-profile.page.ts
+9 -2
View File
@@ -1,10 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { AnimationController, ModalController } from '@ionic/angular';
import { AnimationController, ModalController,Platform } from '@ionic/angular';
import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
import { PinPage } from 'src/app/shared/pin/pin.page';
import { SessionStore } from 'src/app/store/session.service';
import { environment } from 'src/environments/environment';
import { Platform } from '@ionic/angular';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service';
@Component({
selector: 'app-edit-profile',
@@ -19,6 +20,8 @@ export class EditProfilePage implements OnInit {
constructor(private modalController:ModalController,
private animationController: AnimationController,
public platform: Platform,
private backgroundservice: BackgroundService,
public ThemeService: ThemeService
) {}
ngOnInit() {}
@@ -113,5 +116,9 @@ export class EditProfilePage implements OnInit {
}
changeTheme(name) {
this.ThemeService.setTheme(name)
}
}
src/app/modals/profile/profile.page.html
+2 -1
View File
@@ -6,7 +6,8 @@
</div>
</div>
<div class="btn-close d-flex cursor-pointer" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div>
</div>
</ion-header>
src/app/modals/profile/profile.page.scss
+5
View File
@@ -25,6 +25,8 @@
}
.profile-content{
padding: 20px 20px;
//color: var(--profile-text-color) !important;
}
.icon{
@@ -35,12 +37,15 @@
font-weight: 300;
font-size: 20px !important;
margin-bottom: 40px !important;
color: var(--profile-text-color) !important;
}
.line{
width: 100% !important;
margin-top: 15px;
border-top: 1px solid #d8d8d8;
color: var(--profile-title-color-RoleDescription) !important;
}
.btn-delete{
src/app/modals/profile/profile.page.ts
+3 -1
View File
@@ -12,6 +12,7 @@ import { StorageService } from '../../services/storage.service';
import { NotificationsService } from '../../services/notifications.service';
import { SessionStore } from 'src/app/store/session.service';
import { EventTrigger } from '../../services/eventTrigger.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-profile',
@@ -44,7 +45,8 @@ export class ProfilePage implements OnInit {
private notificationservice: NotificationsService,
private platform: Platform,
private notificationsService: NotificationsService,
private eventtrigger: EventTrigger
private eventtrigger: EventTrigger,
public ThemeService: ThemeService
) {
this.loggeduser = authService.ValidatedUser;
src/app/modals/view-document/view-document.page.html
+2 -2
View File
@@ -2,7 +2,7 @@
<ion-toolbar class="d-flex">
<div class="d-flex align-items-center px-20 pt-20 font-25">
<div class="left cursor-pointer" (click)="close()">
<fa-icon icon="chevron-left" class="menu-icon"></fa-icon>
<fa-icon icon="chevron-left" class="menu-icon font-awesome-1"></fa-icon>
</div>
<div class="middle add-ellipsis">
@@ -10,7 +10,7 @@
</div>
<div class="right cursor-pointer" (click)="openOptions()">
<fa-icon icon="ellipsis-v" class="menu-icon"></fa-icon>
<fa-icon icon="ellipsis-v" class="menu-icon font-awesome-1"></fa-icon>
</div>
</div>
src/app/pages/agenda/agenda.page.html
+28 -12
View File
@@ -22,7 +22,7 @@
<!-- Calendar is here -->
<div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="loggeduser.Profile =='PR'">
<div class="calendar-container" [style.height]="calendarHeight">
<div class="calendar-container" [style.height]="calendarHeight ">
<ion-row class="ion-justify-content-between calendar-tool-tip">
<ion-row class="ion-align-items-center">
@@ -30,7 +30,9 @@
<div class="arrow cursor-pointer">
<button (click)="back()" class="btn-no-color" >
<ion-icon slot="icon-only" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
</button>
</div>
@@ -39,8 +41,10 @@
<h2 class="capitaliseText d-flex align-center">
{{ viewTitle }}
<div class="cursor-pointer" (click)="dropdownScrollWeal = true; onDropDownScrollWeal()">
<ion-icon style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
<div (click)="dropdownScrollWeal = true; onDropDownScrollWeal()" class="cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
</div>
</h2>
@@ -99,7 +103,9 @@
</div> -->
<!-- Move forward one screen of the slides -->
<div (click)="next()" class="arrow cursor-pointer">
<ion-icon slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
</div>
</ion-row>
@@ -113,12 +119,16 @@
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
<ion-icon class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
<button class="btn-no-color cursor-pointer" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
</button>
<button class="btn-no-color cy-add-event" (click)="clearContact();openAddEvent();">
<ion-icon class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
<button class="btn-no-color cy-add-event cursor-pointer" (click)="clearContact();openAddEvent();">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-add.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-add.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons" src="assets/images/theme/tribunal/icons-add.svg" ></ion-icon>
</button>
</ion-row>
@@ -180,10 +190,14 @@
<ion-row class="timeline-header pb-0 ion-justify-content-between ion-align-items-center currente-date-timelien">
<ion-row class="timeline-date align-center">
<button class="btn-no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
<ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-up.svg" ></ion-icon>
</button>
<button class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='320px';showCalendar=true">
<ion-icon class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-down.svg" ></ion-icon>
</button >
@@ -195,7 +209,9 @@
<div class="filter-name">{{timelineFilterState}}</div>
<!-- Icon -->
<button (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
<ion-icon src="assets/images/icons-arrow-arrow-down.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
</button>
<!-- List -->
src/app/pages/agenda/agenda.page.scss
+47 -22
View File
@@ -15,7 +15,7 @@
.monthview-current{
/* background-color: red; */
border-bottom: 1px solid lightskyblue !important;
border-bottom: 1px solid rgb(158, 250, 135) !important;
}
.monthview-selected {
/* background-color: lightskyblue !important; */
@@ -255,7 +255,7 @@ td.monthview-primary-with-event {
.div-top-header{
width: 400px;
margin: 0 auto;
background-color: #0782c9;
background-color: #07c941;
padding-top: 15px;
border: 0!important;
@@ -284,8 +284,6 @@ td.monthview-primary-with-event {
height: 100%;
font-family: Roboto;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
/* padding: 25px 20px 0 20px; */
@@ -395,6 +393,7 @@ td.monthview-primary-with-event {
.currente-date-timelien{
cursor: pointer;
padding: 10px 20px;
.timeline-date{
font-size: 15px;
@@ -409,10 +408,10 @@ td.monthview-primary-with-event {
font-weight: normal;
ion-icon{
font-size: 35px;
color: #0d89d1;
color: var(--title-text-color);
}
.filter-name{
color: #0d89d1;
color: var(--title-text-color);
font-family: Roboto;
font-size: 15px;
margin-right: 25px;
@@ -437,7 +436,12 @@ td.monthview-primary-with-event {
font-weight: normal;
}
li.active{
background-color: rgba(66, 185, 254, 0.1);
background-color: var(--mat-selected) !important;
color: white;
}
li:hover:not(.active){
background-color: var(--mat-selected-hover);
}
}
}
@@ -512,7 +516,7 @@ td.monthview-primary-with-event {
font-family: Roboto;
font-size: 15px;
font-weight: bold;
color: #0d89d1;
color: var(--title-text-color);
}
.description p{
@@ -572,12 +576,6 @@ td.monthview-primary-with-event {
}
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 25px;
}
.calendar-border{
background: #ebebeb;
@@ -602,7 +600,7 @@ td.monthview-primary-with-event {
overflow: hidden;
.calendar-timeline{
border-top-right-radius: 24px;
border-top-right-radius: 0px;
width: calc(100%);
overflow: hidden;
@@ -618,11 +616,6 @@ td.monthview-primary-with-event {
}
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 25px;
}
.event-details{
@@ -636,6 +629,7 @@ td.monthview-primary-with-event {
.calendar-timeline{
border-top-right-radius: 0px;
border-top-left-radius: 25px;
width: calc(100% - 40%);
border-right: 1px solid #d8d8d8;
@@ -751,13 +745,13 @@ app-approve-event{
}
li.active {
background-color: #42b9fe !important;
background-color: var(--mat-selected) !important;
color: white;
}
li:hover{
cursor: pointer;
background-color: #e6f6ff75 ;
background-color: var(--mat-selected-hover) ;
}
}
@@ -770,3 +764,34 @@ app-approve-event{
width: 100%;
z-index: 99;
}
@media only screen and (min-width: 1225px) {
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 25px;
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 0px;
}
}
@media only screen and (min-width: 321px) {
.calendar-timeline{
height: 100%;
background-color: white;
border-top-left-radius: 0px;
}
.event-details{
width: 40%;
background: white;
border-top-right-radius: 25px;
}
}
src/app/pages/agenda/agenda.page.ts
+3 -1
View File
@@ -31,6 +31,7 @@ import { ChangeProfileService } from 'src/app/services/change-profile.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({
@@ -176,7 +177,8 @@ export class AgendaPage implements OnInit {
private changeProfileService: ChangeProfileService,
private sqliteservice: SqliteService,
private platform: Platform,
private backgroundservice: BackgroundService
private backgroundservice: BackgroundService,
public ThemeService: ThemeService
) {
this.dateAdapter.setLocale('es');
src/app/pages/agenda/edit-event/edit-event.page.html
+6 -4
View File
@@ -205,7 +205,8 @@
</ion-item>
</div>
<div class="add-people">
<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>
@@ -226,7 +227,8 @@
</ion-item>
</div>
<div class="add-people">
<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>
@@ -248,7 +250,8 @@
<div class="d-flex container-div width-100 ion-item-container-no-border" >
<ion-label (click)="getDoc()" class="cursor-pointer">
<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>
@@ -272,7 +275,6 @@
<span class="app-name span-left" *ngIf="document.ApplicationId == 386"> Acções Presidenciais </span>
<span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
<!-- <span class="span-right" *ngIf="document.CreateDate"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span> -->
</p>
</ion-label>
</ion-item>
src/app/pages/agenda/edit-event/edit-event.page.scss
+2 -2
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;
@@ -104,7 +104,7 @@
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color:var(--title-text-color);
}
/* SPAN */
src/app/pages/agenda/edit-event/edit-event.page.ts
+3
View File
@@ -11,6 +11,8 @@ import { ToastService } from 'src/app/services/toast.service';
import { Event } from '../../../models/event.model';
import { AttendeesPageModal } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-edit-event',
@@ -56,6 +58,7 @@ export class EditEventPage implements OnInit {
private attachmentsService: AttachmentsService,
private toastService: ToastService,
private router: Router,
public ThemeService: ThemeService
) {
this.postEvent = new Event();
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+3 -1
View File
@@ -2,7 +2,9 @@
<div class="header-content">
<div hidden class="header-icon-left">
<button class="btn-no-color cursor-pointer" (click)="close()">
<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/icons-arrow-arrow-left.svg"></ion-icon>
</button>
</div>
<div class="header-title">
src/app/pages/agenda/emend-message-modal/emend-message-modal.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-emend-message-modal',
@@ -11,6 +12,7 @@ export class EmendMessageModalPage implements OnInit {
constructor(
private modalController: ModalController,
public ThemeService: ThemeService
) {
this.emendMessage = '';
}
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+2 -1
View File
@@ -1,7 +1,8 @@
<ion-content class="wrapper">
<div class="arrow-right" (click)="closePopover()">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+3 -1
View File
@@ -8,6 +8,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
import { Location } from '@angular/common';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-event-actions-popover',
@@ -26,7 +27,8 @@ export class EventActionsPopoverPage implements OnInit {
private popoverController: PopoverController,
private animationController: AnimationController,
private toastService: ToastService,
private location: Location) {
private location: Location,
public ThemeService: ThemeService) {
this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('InstanceId');
}
src/app/pages/agenda/new-event/new-event.page.html
+10 -7
View File
@@ -193,7 +193,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipants()" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -208,8 +208,9 @@
</ion-list>
</ion-item>
</div>
<div (click)="addParticipants()" class="add-people cursor-pointer">
<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>
@@ -220,7 +221,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height">
<div class="ion-input-class-no-height cursor-pointer" (click)="addParticipantsCC()">
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -235,8 +236,9 @@
</ion-list>
</ion-item>
</div>
<div (click)="addParticipantsCC()" class="add-people cursor-pointer">
<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>
@@ -258,7 +260,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/pages/agenda/new-event/new-event.page.scss
+2 -2
View File
@@ -108,7 +108,7 @@ ion-content{
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
@@ -121,7 +121,7 @@ ion-content{
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color:var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/pages/agenda/new-event/new-event.page.ts
+2
View File
@@ -15,6 +15,7 @@ import { SearchPage } from '../../search/search.page';
import { ThemePalette } from '@angular/material/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { EventRecurrence } from 'src/app/models/agenda/eventrecurrence.model';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
@@ -67,6 +68,7 @@ export class NewEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
userService: AuthService,
public ThemeService: ThemeService
) {
this.loggeduser = userService.ValidatedUser;
this.postEvent = new Event();
src/app/pages/agenda/view-event/view-event.page.html
+6 -3
View File
@@ -15,7 +15,8 @@
<div class="title-content d-flex justify-between width-100">
<div class="left">
<button class="btn-no-color d-flex align-center" (click)="goBack()">
<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="middle">
@@ -23,7 +24,8 @@
</div>
<div class="menu-options d-flex">
<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>
@@ -97,7 +99,8 @@
</div>
<div (click)="docIndex(i);LoadDocumentDetails()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
<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/pages/agenda/view-event/view-event.page.scss
+2 -2
View File
@@ -185,7 +185,7 @@ ion-menu{
}
.attach-document{
font-size: 15px;
color: #0d89d1;
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
@@ -198,7 +198,7 @@ ion-menu{
.attach-title-item{
width: 100%;
font-size: 15px;
color:#0d89d1;
color:var(--title-text-color);
}
/* SPAN */
.span-left{
src/app/pages/agenda/view-event/view-event.page.ts
+4 -1
View File
@@ -19,6 +19,8 @@ import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedi
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { BackgroundService } from 'src/app/services/background.service';
import { StorageService } from 'src/app/services/storage.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-view-event',
@@ -68,7 +70,8 @@ export class ViewEventPage implements OnInit {
public platform: Platform,
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
private storage: StorageService
private storage: StorageService,
public ThemeService: ThemeService
) {
this.isEventEdited = false;
this.loadedEvent = new Event();
src/app/pages/chat/chat.page.html
+18 -8
View File
@@ -8,7 +8,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content d-flex height-100">
<div class="main-content d-flex height-100 border-t-radius">
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column flex-grow-1">
<!-- <p class="text-center mt-0 aside-title px-20">Chat</p> -->
@@ -18,13 +18,15 @@
</div>
<div class="div-icon">
<button class="btn-no-color" (click)="openContactsPage()">
<ion-icon slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="openNewGroupPage()">
<ion-icon slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-group.svg" ></ion-icon>
</button>
<button *ngIf="hideRefreshBtn" class="btn-no-color" (click)="refreshing()">
<ion-icon class="title-icon" name="reload-circle"></ion-icon>
<ion-icon class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div>
@@ -46,11 +48,13 @@
*ngFor="let dm of userDirectMessages"
[class.item-active]="dm._id == idSelected">
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && dm._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && dm._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-chat-40-hover.svg"></ion-icon>
</div>
<div [class.highlight]="dm._id =='cjFv5XfreKz5j3fWW'"
(click)="openMessagesPage(dm._id)"
class="item-content flex-grow-1"><!-- (click)="openMessages(dm)" -->
class="item-content flex-grow-1 cursor-pointer"><!-- (click)="openMessages(dm)" -->
<div class="item-title-time">
<div class="item-title" [class.item-title-active]="dm._id == idSelected">
<ion-label *ngFor="let user of dm.uids">
@@ -88,10 +92,16 @@
[class.item-active]="group._id ==idSelected"
class="item item-hover d-flex">
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
<!-- <ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon> -->
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
</div>
<div
(click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1">
(click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title" [class.item-title-active]="group._id ==idSelected">
<ion-label>{{group.name.split('-').join(' ')}}</ion-label>
src/app/pages/chat/chat.page.scss
+2 -4
View File
@@ -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{
src/app/pages/chat/chat.page.ts
+3 -6
View File
@@ -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<any>;
@@ -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();
src/app/pages/chat/edit-group/edit-group.page.html
+2 -1
View File
@@ -4,7 +4,8 @@
<div class="title-content width-100">
<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/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle">
src/app/pages/chat/edit-group/edit-group.page.ts
+2
View File
@@ -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');
}
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+3 -2
View File
@@ -3,8 +3,9 @@
<div class="main-header">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<button class="btn-no-color cursor-pointer" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="div-title">
src/app/pages/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',
@@ -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'];
src/app/pages/chat/group-messages/group-messages.page.html
+10 -6
View File
@@ -6,7 +6,7 @@
<div class="left">
<button class="btn-no-color" (click)="close()">
<!-- <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> -->
<fa-icon icon="chevron-left" class="header-top-btn"></fa-icon>
<fa-icon icon="chevron-left" class="header-top-btn font-awesome-1"></fa-icon>
</button>
</div>
<div class="middle-container" *ngIf="!showMessageOptions">
@@ -20,13 +20,14 @@
<div class="right">
<button class="btn-no-color" (click)="openOptions()">
<!-- <ion-icon src="assets/images/icons-menu.svg"></ion-icon> -->
<fa-icon icon="ellipsis-v" class="header-top-btn"></fa-icon>
<fa-icon icon="ellipsis-v" class="header-top-btn font-awesome-1"></fa-icon>
</button>
</div>
</div>
<div (click)="addContacts()" 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" >
@@ -124,7 +125,8 @@
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
</button>
</div>
<div class="message-box width-80">
@@ -137,10 +139,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/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/pages/chat/group-messages/group-messages.page.ts
+2
View File
@@ -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;
src/app/pages/chat/messages/contacts/contacts.page.html
+5 -4
View File
@@ -2,9 +2,10 @@
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<div class="back-icon ">
<button class="btn-no-color cursor-pointer" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="div-title">
@@ -34,7 +35,7 @@
<ion-label>{{header}}</ion-label>
</div>
<div (click)="createRoom(user.username)" *virtualItem="let user" class="item-user">
<div (click)="createRoom(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/pages/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/pages/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',
@@ -28,6 +29,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/pages/chat/messages/messages.page.html
+11 -6
View File
@@ -8,7 +8,7 @@
<div class="left">
<button class="btn-no-color" (click)="close()">
<!-- <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> -->
<fa-icon icon="chevron-left" class="header-top-btn"></fa-icon>
<fa-icon icon="chevron-left" class="header-top-btn font-awesome-1"></fa-icon>
</button>
</div>
<div class="middle-container" *ngIf="!showMessageOptions">
@@ -23,13 +23,15 @@
</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/theme/gov/icons-menu.svg"></ion-icon>
</button>
</div>
</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>
@@ -125,7 +127,8 @@
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
</button>
</div>
<div class="width-70">
@@ -138,10 +141,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/pages/chat/messages/messages.page.ts
+2 -1
View File
@@ -19,7 +19,7 @@ import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/mes
import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
import { environment } from 'src/environments/environment';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-messages',
@@ -73,6 +73,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
private fileService: FileService,
private gestureController: GestureController,
private processes: ProcessesService,
public ThemeService: ThemeService
) {
/* this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
src/app/pages/chat/new-group/contacts/contacts.page.html
+4 -3
View File
@@ -3,14 +3,15 @@
<div class="main-header">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<button class="btn-no-color cursor-pointer" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/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/pages/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/pages/chat/new-group/new-group.page.html
+2 -1
View File
@@ -4,7 +4,8 @@
<div class="title-content width-100">
<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/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle">
src/app/pages/chat/new-group/new-group.page.ts
+2
View File
@@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-new-group',
@@ -22,6 +23,7 @@ export class NewGroupPage implements OnInit {
private popoverController: PopoverController,
private modalController: ModalController,
private navParams: NavParams,
public ThemeService: ThemeService
)
{
this.isGroupCreated = false;
src/app/pages/events/attendees/attendees.page.html
+12 -4
View File
@@ -14,14 +14,18 @@
<div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *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>
<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 +39,8 @@
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" 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 +58,10 @@
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" 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/pages/events/attendees/attendees.page.ts
+3 -1
View File
@@ -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');
src/app/pages/events/edit-event/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/pages/events/events.page.html
+38 -1
View File
@@ -34,10 +34,26 @@
</div>
<button class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon
*ngIf="ThemeService.currentTheme == 'default' "
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next"
slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'tribunal' "
class="icon-next"
slot="end"
src="assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
@@ -85,7 +101,26 @@
<div class="text">Correspondência por ler</div>
</div>
<button (click)="viewExpedientListPage()" class="btn-no-color cursor-pointer">
<ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg"></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'default' "
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next"
slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon>
<ion-icon
*ngIf="ThemeService.currentTheme == 'tribunal' "
class="icon-next"
slot="end"
src="assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
@@ -108,4 +143,6 @@
</div>
</div>
</div>
<!-- <iframe id="home-iframe" style="width: 100%;" src="/assets/www/pdfjs/web/viewer.html?file=/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf"></iframe> -->
</ion-content>
src/app/pages/events/events.page.scss
+17 -12
View File
@@ -85,7 +85,7 @@ ion-toolbar{
.p-small{
font-size: 13pt;
margin-top: 13px;
color:#000;
color: var(--header-tab-text-white);
margin-right: 25px !important;
text-align: right;
/* color: #ffffff; */
@@ -182,7 +182,7 @@ ion-toolbar{
.ion-icon-location{
text-align: center;
display: block;
color: #000;
color: var(--subtitle-text-color);
font-size: 16px;
margin: 0 auto;
}
@@ -278,10 +278,9 @@ ion-toolbar{
}
.event-number{
color: white;
color: var(--header-tab-text-white);
font-family: Roboto;
font-size: 15px;
color: var(--white);
bold{
font-family: Roboto;
@@ -294,7 +293,7 @@ ion-toolbar{
font-family: Roboto;
font-size: 30px;
text-align: center;
color: var(--white);
color: var(--header-tab-text-white);
line-height: unset;
margin-top: 10px;
}
@@ -309,7 +308,7 @@ ion-toolbar{
font-size: em(25px);
font-family: Roboto;
font-weight: 300;
color: var(--white);
color: var(--header-tab-text-white);
margin-right: 7px;
}
@@ -317,7 +316,7 @@ ion-toolbar{
margin-top: 2px;
font-family: Roboto;
font-size: 15px;
color: var(--white);
color: var(--header-tab-text-white);
}
}
@@ -330,9 +329,12 @@ ion-toolbar{
.schedule {
max-width: 400px;
font-family: Roboto;
background-color: white;
box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);
border: solid 1px #e9e9e9;
//background-color: white;
background-color: var(--box-container-color);
//box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);
box-shadow: 0 0 10px 0 var(--box-border-color-shadow);
//border: solid 1px #e9e9e9;
border: solid 1px var(--box-border-color);
margin-bottom: 20px;
border-radius: 25px;
display: flex;
@@ -381,10 +383,12 @@ ion-toolbar{
//padding-bottom: 5px;
padding: 5px 20px 5px 20px;
background-color: transparent !important;
}
ion-list{
padding: 0px;
margin: 0px;
background-color: transparent !important;
.d-flex{
width: 100%;
display: flex;
@@ -398,8 +402,8 @@ ion-toolbar{
display: flex;
justify-content: space-between;
align-items: center;
background-color: transparent !important;
--background: transparent !important;
.schedule-time{
margin-right: 10px;
.time-start{
@@ -436,7 +440,8 @@ ion-toolbar{
font-family: Roboto;
font-size: 15px;
font-weight: bold;
color: #0d89d1;
//color: #0d89d1;
color: var(--title-text-color)
}
.description p{
white-space: nowrap;
src/app/pages/events/events.page.ts
+11 -1
View File
@@ -20,7 +20,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
import { NetworkConnectionService } from 'src/app/services/network-connection.service'
import { BackgroundService } from 'src/app/services/background.service';
import { momentG } from 'src/plugin/momentG';
import { ThemeService } from 'src/app/services/theme.service'
@Component({
selector: 'app-events',
templateUrl: './events.page.html',
@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
private sqliteservice: SqliteService,
private networkconnection: NetworkConnectionService,
private backgroundservice: BackgroundService,
public ThemeService: ThemeService
) {
this.existingScreenOrientation = this.screenOrientation.type;
console.log(this.existingScreenOrientation);
@@ -113,6 +114,15 @@ export class EventsPage implements OnInit {
} catch (error) {
console.log("Error creating local database: ", error)
}
window['zipPhoneCallback'] = function (zipphone) {
var frame = document.getElementById('home-iframe');
if(frame) {
frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }});
}
}
}
ngOnInit() {
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+4 -2
View File
@@ -7,13 +7,15 @@
<div class="main-header" >
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class="font-30 cursor-pointer align-center d-flex" (click)="goBack()" 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">
<div class="title">{{ task.Folio}}</div>
</div>
<div class="div-icon" (click)="openOptions()">
<ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-25 cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</div>
</div>
</div>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+1 -1
View File
@@ -132,7 +132,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/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+2
View File
@@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { Platform } from '@ionic/angular';
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-despacho-pr',
@@ -59,6 +60,7 @@ export class DespachoPrPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService
) {
this.activatedRoute.paramMap.subscribe(params => {
if (params["params"].SerialNumber) {
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+3 -2
View File
@@ -11,7 +11,7 @@
</div>
<div class="theicon btn-refresh">
<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>
@@ -45,7 +45,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>

Some files were not shown because too many files have changed in this diff Show More